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

chopstx_poll: More change.

Browse Source 
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka
2019-12-27 09:24:51 +09:00
parent 9253777f5f
commit 6be482413c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
chopstx.c
View File

@@ -1393,11 +1393,7 @@ chx_proxy_init (struct chx_px *px, uint32_t *cp)
* should be one of: * should be one of:
* chopstx_poll_cond_t, chopstx_poll_join_t, or chopstx_intr_t. * chopstx_poll_cond_t, chopstx_poll_join_t, or chopstx_intr_t.
* *
* Returns number of active descriptors. Don't assume no active * Returns number of active descriptors.
* 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 int
chopstx_poll (uint32_t *usec_p, int n, struct chx_poll_head *const pd_array[]) chopstx_poll (uint32_t *usec_p, int n, struct chx_poll_head *const pd_array[])
@@ -1415,6 +1411,7 @@ chopstx_poll (uint32_t *usec_p, int n, struct chx_poll_head *const pd_array[])
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
chx_proxy_init (&px[i], &counter); chx_proxy_init (&px[i], &counter);
again:
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
{ {
pd = pd_array[i]; pd = pd_array[i];
@@ -1522,6 +1519,9 @@ chopstx_poll (uint32_t *usec_p, int n, struct chx_poll_head *const pd_array[])
if (r < 0) if (r < 0)
chopstx_exit (CHOPSTX_CANCELED); chopstx_exit (CHOPSTX_CANCELED);
if (counter == 0 && (usec_p == NULL || *usec_p))
goto again;
return counter; return counter;
} }