pkarashchenko commented on a change in pull request #5171:
URL: https://github.com/apache/incubator-nuttx/pull/5171#discussion_r779009113
##########
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:
I'm not sure in this logic. We run this code even if `rtcb` does not
match `pholder->htcb`. I'm out of laptop till 8 Jan, so will appreciate if you
can describe more a use case that meets this situation.
--
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
