From 37873eb0a9e945e52eec7966192729be9fdb09f2 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Thu, 28 Feb 2002 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 2002-02-28 --- pc/mem.h | 2 +- port/proc.c | 10 +++++----- port/sysproc.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pc/mem.h b/pc/mem.h index 6a6b88306a6896d2792729b51d6c1224391984ae..df270c9ae55075154c10b10b38843ab14c71b401 100644 --- a/pc/mem.h +++ b/pc/mem.h @@ -22,7 +22,7 @@ /* * Time */ -#define HZ (82) /* clock frequency */ +#define HZ (100) /* clock frequency */ #define MS2HZ (1000/HZ) /* millisec per clock tick */ #define TK2SEC(t) ((t)/HZ) /* ticks to seconds */ #define MS2TK(t) (((t)*HZ+500)/1000) /* milliseconds to closest tick */ diff --git a/port/proc.c b/port/proc.c index dc219a4640ebde5a31941f5101d6e697fea24d43..e7a32fb2b5d39c5ff358178d972b81ee6ee777be 100644 --- a/port/proc.c +++ b/port/proc.c @@ -133,7 +133,7 @@ anyhigher(void) enum { - Squantum = (HZ+Nrq-1)/Nrq, + Squantum = 1, }; void @@ -150,13 +150,13 @@ ready(Proc *p) /* history counts */ if(p->state == Running){ p->rt++; - pri = ((p->art + (p->rt<<1))>>2)/Squantum; + pri = (p->art + p->rt)/2; } else { - p->art = (p->art + (p->rt<<1))>>2; + p->art = (p->art + p->rt + 2)/2; + pri = (p->art + p->rt)/2; p->rt = 0; - pri = p->art/Squantum; } - pri = p->basepri - pri; + pri = p->basepri - (pri/Squantum); if(pri < 0) pri = 0; diff --git a/port/sysproc.c b/port/sysproc.c index 4f8ff12386ed5a61140328bf41fc1fae8345e799..e41c93bfc466d15d2f4c813ccc5b5f40c91edeb4 100644 --- a/port/sysproc.c +++ b/port/sysproc.c @@ -194,8 +194,8 @@ sysrfork(ulong *arg) * (i.e. has bad properties) and has to be discarded. */ flushmmu(); - p->priority = up->priority; p->basepri = up->basepri; + p->priority = up->basepri; p->fixedpri = up->fixedpri; p->mp = up->mp; wm = up->wired;