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

Fix softclock calling so we don't loose timeouts (I broke this ~10h ago)

Browse Source
This commit is contained in:
Poul-Henning Kamp 1998-01-11 00:44:31 +00:00
parent a1db8c36a5
commit 55c449bc0f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=32412
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/kern_clock.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
* $Id: kern_clock.c,v 1.49 1998/01/10 13:16:19 phk Exp $
* $Id: kern_clock.c,v 1.50 1998/01/10 14:55:02 phk Exp $
*/
/* Portions of this software are covered by the following: */
@ -629,7 +629,11 @@ hardclock(frame)
CPU_CLOCKUPDATE(&time, &newtime);
}
setsoftclock();
if (TAILQ_FIRST(&callwheel[ticks & callwheelmask]) == NULL) {
softticks++;
} else {
setsoftclock();
}
}
void

8
sys/kern/kern_tc.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
* $Id: kern_clock.c,v 1.49 1998/01/10 13:16:19 phk Exp $
* $Id: kern_clock.c,v 1.50 1998/01/10 14:55:02 phk Exp $
*/
/* Portions of this software are covered by the following: */
@ -629,7 +629,11 @@ hardclock(frame)
CPU_CLOCKUPDATE(&time, &newtime);
}
setsoftclock();
if (TAILQ_FIRST(&callwheel[ticks & callwheelmask]) == NULL) {
softticks++;
} else {
setsoftclock();
}
}
void

8
sys/kern/kern_timeout.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
* $Id: kern_timeout.c,v 1.49 1998/01/10 13:16:26 phk Exp $
* $Id: kern_timeout.c,v 1.50 1998/01/10 14:55:14 phk Exp $
*/
/* Portions of this software are covered by the following: */
@ -82,7 +82,7 @@ struct callout_list callfree;
int callwheelsize, callwheelbits, callwheelmask;
struct callout_tailq *callwheel;
static int softticks; /* Like ticks, but for softclock(). */
int softticks; /* Like ticks, but for softclock(). */
static struct callout *nextsoftcheck; /* Next callout to be checked. */
/*
@ -119,10 +119,6 @@ softclock()
* we last allowed interrupts.
*/
if (TAILQ_FIRST(&callwheel[ticks & callwheelmask]) == NULL) {
softticks++;
return;
}
(void)splsoftclock();

4
sys/sys/callout.h
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)callout.h 8.2 (Berkeley) 1/21/94
* $Id: callout.h,v 1.9 1997/09/24 16:39:27 gibbs Exp $
* $Id: callout.h,v 1.10 1997/12/01 05:45:15 davidg Exp $
*/
#ifndef _SYS_CALLOUT_H_
@ -66,7 +66,7 @@ extern struct callout_list callfree;
extern struct callout *callout;
extern int ncallout;
extern struct callout_tailq *callwheel;
extern int callwheelsize, callwheelbits, callwheelmask;
extern int callwheelsize, callwheelbits, callwheelmask, softticks;
#endif /* KERNEL */
#endif /* _SYS_CALLOUT_H_ */