deon/chopstx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix chopstx_poll for condition variables, check after woken up.

Browse Source 
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka
2019-12-27 09:18:11 +09:00
parent 8b4ecad359
commit 50a5951422
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
chopstx.c
View File

@@ -468,7 +468,7 @@ chx_recv_irq (uint32_t irq_num)
chx_wakeup (p);
if (r == NULL || (uint16_t)r->prio < px->master->prio)
return chx_ready_pop ();
return chx_ready_pop ();
}
return NULL;
@@ -1491,7 +1491,11 @@ chx_proxy_init (struct chx_px *px, uint32_t *cp)
* should be one of:
* chopstx_poll_cond_t, chopstx_poll_join_t, or chopstx_intr_t.
*
* Returns number of active descriptors.
* Returns number of active descriptors. Don't assume no active
* descriptors means timeout. It is possible for chopstx_poll to
* return zero (but not because of timeout), when it's woken up but
* found no condition matches. Application should call chopstx_poll
* again in this situation.
*/
int
chopstx_poll (uint32_t *usec_p, int n, struct chx_poll_head *const pd_array[])
@@ -1571,6 +1575,20 @@ chopstx_poll (uint32_t *usec_p, int n, struct chx_poll_head *const pd_array[])
ll_dequeue ((struct chx_pq *)&px[i]);
chx_spin_unlock (&pc->cond->lock);
}
else
{ /* Check the condition again after woken up. */
if (pc->mutex)
chopstx_mutex_lock (pc->mutex);
if ((*pc->check) (pc->arg) == 0)
{ /* Condition doesn't met. */
pc->ready = 0;
counter--;
}
if (pc->mutex)
chopstx_mutex_unlock (pc->mutex);
}
}
else if (pd->type == CHOPSTX_POLL_INTR)
{