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

Try to fix poll & select after I broke them.

Browse Source
This commit is contained in:
Poul-Henning Kamp 1998-04-02 07:22:17 +00:00
parent 47b630b949
commit 4ff16568be
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/kern/sys_generic.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)sys_generic.c 8.5 (Berkeley) 1/21/94
* $Id: sys_generic.c,v 1.33 1997/11/23 10:30:50 bde Exp $
* $Id: sys_generic.c,v 1.34 1998/03/30 09:50:29 phk Exp $
*/
#include "opt_ktrace.h"
@ -600,11 +600,9 @@ select(p, uap)
error = EINVAL;
goto done;
}
timo = tvtohz(&atv);
term = ticks + tvtohz(&atv);
} else
timo = 0;
if (timo)
term = timo + ticks;
term = 0;
retry:
ncoll = nselcoll;
p->p_flag |= P_SELECT;
@ -612,10 +610,11 @@ select(p, uap)
if (error || p->p_retval[0])
goto done;
s = splhigh();
if (timo && term <= ticks) {
if (term && term <= ticks) {
splx(s);
goto done;
}
timo = term ? term - ticks : 0;
if ((p->p_flag & P_SELECT) == 0 || nselcoll != ncoll) {
splx(s);
goto retry;
@ -725,11 +724,9 @@ poll(p, uap)
error = EINVAL;
goto done;
}
timo = tvtohz(&atv);
term = ticks + tvtohz(&atv);
} else
timo = 0;
if (timo)
term = timo + ticks;
term = 0;
retry:
ncoll = nselcoll;
p->p_flag |= P_SELECT;
@ -737,10 +734,11 @@ poll(p, uap)
if (error || p->p_retval[0])
goto done;
s = splhigh();
if (timo && term <= ticks) {
if (term && term <= ticks) {
splx(s);
goto done;
}
timo = term ? term - ticks : 0;
if ((p->p_flag & P_SELECT) == 0 || nselcoll != ncoll) {
splx(s);
goto retry;