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

ll_dequeue for PX only when not ready

Browse Source
This commit is contained in:
NIIBE Yutaka
2016-05-16 20:37:33 +09:00
parent 98977937cb
commit 3651aa64b4
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
chopstx.c
View File

@@ -1857,23 +1857,26 @@ chopstx_poll (uint32_t *usec_p, int n, ...)
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
{ {
pd = va_arg (ap, struct chx_poll_head *); pd = va_arg (ap, struct chx_poll_head *);
chx_cpu_sched_lock ();
chx_spin_lock (&px[i].lock);
if (pd->type == CHOPSTX_POLL_INTR) if (pd->type == CHOPSTX_POLL_INTR)
{ {
struct chx_intr *intr = (struct chx_intr *)pd; struct chx_intr *intr = (struct chx_intr *)pd;
chx_cpu_sched_lock ();
chx_spin_lock (&q_intr.lock);
if (intr->ready) if (intr->ready)
chx_clr_intr (intr->irq_num); chx_clr_intr (intr->irq_num);
else else
chx_disable_intr (intr->irq_num); {
chx_spin_unlock (&q_intr.lock); ll_dequeue ((struct chx_pq *)&px[i]);
chx_cpu_sched_unlock (); chx_disable_intr (intr->irq_num);
}
}
else
{
if (pd->ready == 0)
ll_dequeue ((struct chx_pq *)&px[i]);
} }
chx_cpu_sched_lock ();
chx_spin_lock (&px[i].lock);
ll_dequeue ((struct chx_pq *)&px[i]);
chx_spin_unlock (&px[i].lock); chx_spin_unlock (&px[i].lock);
chx_cpu_sched_unlock (); chx_cpu_sched_unlock ();
} }