xiaoxiang781216 commented on a change in pull request #5171:
URL: https://github.com/apache/incubator-nuttx/pull/5171#discussion_r791994316
##########
File path: include/nuttx/sched.h
##########
@@ -656,6 +656,10 @@ struct tcb_s
sem_t *waitsem; /* Semaphore ID waiting on */
+#ifdef CONFIG_PRIORITY_INHERITANCE
+ FAR struct semholder_s *holdsem; /* List of held semaphores */
Review comment:
move to line 606-612 section
##########
File path: sched/semaphore/sem_holder.c
##########
@@ -1035,18 +945,60 @@ void nxsem_release_holder(FAR sem_t *sem)
{
FAR struct tcb_s *rtcb = this_task();
FAR struct semholder_s *pholder;
+ FAR struct semholder_s *candidate = NULL;
+ unsigned int total = 0;
/* Find the container for this holder */
- pholder = nxsem_findholder(sem, rtcb);
- if (pholder != NULL && pholder->counts > 0)
+#if CONFIG_SEM_PREALLOCHOLDERS > 0
+ for (pholder = sem->hhead; pholder; pholder = pholder->flink)
Review comment:
need add {
##########
File path: sched/semaphore/sem_holder.c
##########
@@ -1035,17 +1011,52 @@ void nxsem_release_holder(FAR sem_t *sem)
{
FAR struct tcb_s *rtcb = this_task();
FAR struct semholder_s *pholder;
+ FAR struct semholder_s *candidate = NULL;
+ unsigned int total = 0;
/* Find the container for this holder */
- pholder = nxsem_findholder(sem, rtcb);
- if (pholder != NULL && pholder->counts > 0)
+#if CONFIG_SEM_PREALLOCHOLDERS > 0
+ for (pholder = sem->hhead; pholder; pholder = pholder->flink)
+ {
+#else
+ int i;
+
+ /* We have two hard-allocated holder structures in sem_t */
+
+ for (i = 0; i < 2; i++)
+ {
+ pholder = &sem->holder[i];
+#endif
+
+ if (pholder->counts <= 0)
+ continue;
+
+ if (pholder->htcb == rtcb)
+ {
+ /* Decrement the counts on this holder -- the holder will be freed
+ * later in nxsem_restore_baseprio.
+ */
+
+ pholder->counts--;
+ return;
+ }
+
+ total++;
+ if (candidate == NULL)
+ candidate = pholder;
+ }
+
+ /* The current task is not a holder */
+
+ if (total == 1)
Review comment:
> If the caller of sem_post is not a holder (such as task1 call sem_wait
and task2 call sem_post), nxsem_findholder(sem, rtcb) must return NULL.
>
in this case, the caller use sem as event, not lock, he should disable
priority inheritance first. Why we need take care the wrong usage? it's caller
responsibility to fix his bug.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
