projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UPAGES 8; dumpstack 96; msgbufmap; kernacc rounding bug fixed
[unix-history]
/
usr
/
src
/
sys
/
kern
/
kern_clock.c
diff --git
a/usr/src/sys/kern/kern_clock.c
b/usr/src/sys/kern/kern_clock.c
index
4d7f9d4
..
fc68fc6
100644
(file)
--- a/
usr/src/sys/kern/kern_clock.c
+++ b/
usr/src/sys/kern/kern_clock.c
@@
-1,4
+1,4
@@
-/*
%H% 3.18 kern_clock.c
*/
+/*
kern_clock.c 4.5 %G%
*/
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
@@
-17,11
+17,18
@@
#include "../h/mtpr.h"
#include "../h/clock.h"
#include "../h/mtpr.h"
#include "../h/clock.h"
+#include "dh.h"
+#include "dz.h"
+
#define SCHMAG 9/10
#define SCHMAG 9/10
+/*
+ * Constant for decay filter for cpu usage.
+ */
+double ccpu = 0.95122942450071400909; /* exp(-1/20) */
/*
/*
- *
c
lock is called straight from
+ *
C
lock is called straight from
* the real time clock interrupt.
*
* Functions:
* the real time clock interrupt.
*
* Functions:
@@
-50,7
+57,7
@@
caddr_t pc;
register struct callo *p1, *p2;
register struct proc *pp;
register int s;
register struct callo *p1, *p2;
register struct proc *pp;
register int s;
- int a, cpstate;
+ int a, cpstate
, i
;
/*
* reprime clock
/*
* reprime clock
@@
-112,11
+119,18
@@
out:
* so we can't enter them recursively and transpose characters.
*/
if (rcnt >= rintvl) {
* so we can't enter them recursively and transpose characters.
*/
if (rcnt >= rintvl) {
+#if NDH11 > 0
dhtimer();
dhtimer();
+#endif
+#if NDZ11 > 0
dztimer();
dztimer();
+#endif
rcnt = 0;
} else
rcnt++;
rcnt = 0;
} else
rcnt++;
+#ifdef CHAOS
+ ch_clock();
+#endif
if (!noproc) {
s = u.u_procp->p_rssize;
u.u_vm.vm_idsrss += s;
if (!noproc) {
s = u.u_procp->p_rssize;
u.u_vm.vm_idsrss += s;
@@
-147,9
+161,13
@@
out:
else
u.u_vm.vm_stime++;
}
else
u.u_vm.vm_stime++;
}
- dk_time[cpstate][dk_busy&(DK_NSTATES-1)]++;
+ cp_time[cpstate]++;
+ for (i = 0; i < DK_NDRIVE; i++)
+ if (dk_busy&(1<<i))
+ dk_time[i]++;
if (!noproc) {
pp = u.u_procp;
if (!noproc) {
pp = u.u_procp;
+ pp->p_cpticks++;
if(++pp->p_cpu == 0)
pp->p_cpu--;
if(pp->p_cpu % 16 == 0) {
if(++pp->p_cpu == 0)
pp->p_cpu--;
if(pp->p_cpu % 16 == 0) {
@@
-164,13
+182,16
@@
out:
runrun++;
}
if (lbolt >= HZ) {
runrun++;
}
if (lbolt >= HZ) {
+#if VAX==780
extern int hangcnt;
extern int hangcnt;
+#endif
if (BASEPRI(ps))
return;
lbolt -= HZ;
++time;
(void) spl1();
if (BASEPRI(ps))
return;
lbolt -= HZ;
++time;
(void) spl1();
+#if VAX==780
/*
* machdep.c:unhang uses hangcnt to make sure uba
* doesn't forget to interrupt (this has been observed).
/*
* machdep.c:unhang uses hangcnt to make sure uba
* doesn't forget to interrupt (this has been observed).
@@
-179,10
+200,11
@@
out:
*/
if (hangcnt)
hangcnt--;
*/
if (hangcnt)
hangcnt--;
+#endif
runrun++;
wakeup((caddr_t)&lbolt);
for(pp = &proc[0]; pp < &proc[NPROC]; pp++)
runrun++;
wakeup((caddr_t)&lbolt);
for(pp = &proc[0]; pp < &proc[NPROC]; pp++)
- if (pp->p_stat && pp->p_stat
<
SZOMB) {
+ if (pp->p_stat && pp->p_stat
!=
SZOMB) {
if(pp->p_time != 127)
pp->p_time++;
if(pp->p_clktim)
if(pp->p_time != 127)
pp->p_time++;
if(pp->p_clktim)
@@
-206,10
+228,10
@@
out:
if(pp->p_stat==SSLEEP||pp->p_stat==SSTOP)
if (pp->p_slptime != 127)
pp->p_slptime++;
if(pp->p_stat==SSLEEP||pp->p_stat==SSTOP)
if (pp->p_slptime != 127)
pp->p_slptime++;
- if
(pp->p_flag&SLOAD) {
- ave(pp->p_aveflt, pp->p_faults, 5);
-
pp->p_faults = 0
;
- }
+ if
(pp->p_flag&SLOAD)
+ pp->p_pctcpu = ccpu * pp->p_pctcpu +
+
(1.0 - ccpu) * (pp->p_cpticks/(float)HZ)
;
+ pp->p_cpticks = 0;
a = (pp->p_cpu & 0377)*SCHMAG + pp->p_nice - NZERO;
if(a < 0)
a = 0;
a = (pp->p_cpu & 0377)*SCHMAG + pp->p_nice - NZERO;
if(a < 0)
a = 0;
@@
-247,17
+269,17
@@
out:
wakeup((caddr_t)&proc[2]);
if (USERMODE(ps)) {
pp = u.u_procp;
wakeup((caddr_t)&proc[2]);
if (USERMODE(ps)) {
pp = u.u_procp;
-#ifdef ERNIE
if (pp->p_uid)
if (pp->p_nice == NZERO && u.u_vm.vm_utime > 600 * HZ)
pp->p_nice = NZERO+4;
(void) setpri(pp);
pp->p_pri = pp->p_usrpri;
if (pp->p_uid)
if (pp->p_nice == NZERO && u.u_vm.vm_utime > 600 * HZ)
pp->p_nice = NZERO+4;
(void) setpri(pp);
pp->p_pri = pp->p_usrpri;
-#endif
}
}
}
}
+#if VAX==780
if (!BASEPRI(ps))
unhang();
if (!BASEPRI(ps))
unhang();
+#endif
if (USERMODE(ps)) {
/*
* We do this last since it
if (USERMODE(ps)) {
/*
* We do this last since it