d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Correct a major error introduced in the per-cpu timeout commit. Sleep

Browse Source 
and wakeup require the same wait channel to function properly.

Found by:	kris
Pointy hat:	me
This commit is contained in:
Jeff Roberson 2008-04-06 11:08:49 +00:00
parent a90c089ccd
commit ce62b59c88
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/kern/kern_timeout.c
View File

@ -655,7 +655,7 @@ _callout_stop_safe(c, safe)
c, c->c_func, c->c_arg);
CC_UNLOCK(cc);
if (sq_locked)
sleepq_release(&cc->cc_curr);
sleepq_release(&cc->cc_waiting);
return (0);
}
@ -687,17 +687,17 @@ _callout_stop_safe(c, safe)
*/
if (!sq_locked) {
CC_UNLOCK(cc);
sleepq_lock(&cc->cc_curr);
sleepq_lock(&cc->cc_waiting);
sq_locked = 1;
goto again;
}
cc->cc_waiting = 1;
DROP_GIANT();
CC_UNLOCK(cc);
sleepq_add(&cc->cc_curr,
sleepq_add(&cc->cc_waiting,
&cc->cc_lock.lock_object, "codrain",
SLEEPQ_SLEEP, 0);
sleepq_wait(&cc->cc_curr, 0);
sleepq_wait(&cc->cc_waiting, 0);
sq_locked = 0;
/* Reacquire locks previously released. */
@ -726,7 +726,7 @@ _callout_stop_safe(c, safe)
return (0);
}
if (sq_locked)
sleepq_release(&cc->cc_curr);
sleepq_release(&cc->cc_waiting);
c->c_flags &= ~(CALLOUT_ACTIVE | CALLOUT_PENDING);