how did these ever work before?

[unix-history] / usr / src / sys / kern / kern_synch.c

diff --git a/usr/src/sys/kern/kern_synch.c b/usr/src/sys/kern/kern_synch.c
index c655da4..84a0d18 100644 (file)
--- a/usr/src/sys/kern/kern_synch.c
+++ b/usr/src/sys/kern/kern_synch.c
@@ -1,4 +1,6 @@
-/*     kern_synch.c    4.21    82/09/08        */
+/*     kern_synch.c    4.26    83/05/21        */
+
+#include "../machine/pte.h"

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -8,16 +10,12 @@
 #include "../h/file.h"
 #include "../h/inode.h"
 #include "../h/vm.h"
 #include "../h/file.h"
 #include "../h/inode.h"
 #include "../h/vm.h"

-#include "../h/pte.h"
-#include "../h/inline.h"
-#include "../h/mtpr.h"
-#ifdef MUSH
-#include "../h/quota.h"
-#include "../h/share.h"
-#endif

 #include "../h/kernel.h"
 #include "../h/buf.h"
 
 #include "../h/kernel.h"
 #include "../h/buf.h"
 

+#ifdef vax
+#include "../vax/mtpr.h"       /* XXX */
+#endif

 /*
  * Force switch among equal priority processes every 100ms.
  */
 /*
  * Force switch among equal priority processes every 100ms.
  */


@@ -26,14 +24,13 @@ roundrobin()
 
        runrun++;
        aston();
 
        runrun++;
        aston();

-       timeout(roundrobin, 0, hz / 10);
+       timeout(roundrobin, (caddr_t)0, hz / 10);

 }
 
 /* constants to digital decay and forget 90% of usage in 5*loadav time */
 #undef ave
 #define        ave(a,b) ((int)(((int)(a*b))/(b+1)))
 int    nrscale = 2;
 }
 
 /* constants to digital decay and forget 90% of usage in 5*loadav time */
 #undef ave
 #define        ave(a,b) ((int)(((int)(a*b))/(b+1)))
 int    nrscale = 2;

-double avenrun[];

 double ccpu = 0.95122942450071400909;          /* exp(-1/20) */
 
 /*
 double ccpu = 0.95122942450071400909;          /* exp(-1/20) */
 
 /*


@@ -46,11 +43,6 @@ schedcpu()
 
        wakeup((caddr_t)&lbolt);
        for (p = proc; p < procNPROC; p++) if (p->p_stat && p->p_stat!=SZOMB) {
 
        wakeup((caddr_t)&lbolt);
        for (p = proc; p < procNPROC; p++) if (p->p_stat && p->p_stat!=SZOMB) {

-#ifdef MUSH
-               if (p->p_quota->q_uid)
-                       p->p_quota->q_cost +=
-                           shconsts.sc_click * p->p_rssize;
-#endif

                if (p->p_time != 127)
                        p->p_time++;
                if (p->p_stat==SSLEEP || p->p_stat==SSTOP)
                if (p->p_time != 127)
                        p->p_time++;
                if (p->p_stat==SSLEEP || p->p_stat==SSTOP)


@@ -60,13 +52,8 @@ schedcpu()
                        p->p_pctcpu = ccpu * p->p_pctcpu +
                            (1.0 - ccpu) * (p->p_cpticks/(float)hz);
                p->p_cpticks = 0;
                        p->p_pctcpu = ccpu * p->p_pctcpu +
                            (1.0 - ccpu) * (p->p_cpticks/(float)hz);
                p->p_cpticks = 0;

-#ifdef MUSH
-               a = ave((p->p_cpu & 0377), avenrun[0]*nrscale) +
-                    p->p_nice - NZERO + p->p_quota->q_nice;
-#else

                a = ave((p->p_cpu & 0377), avenrun[0]*nrscale) +
                     p->p_nice - NZERO;
                a = ave((p->p_cpu & 0377), avenrun[0]*nrscale) +
                     p->p_nice - NZERO;

-#endif

                if (a < 0)
                        a = 0;
                if (a > 255)
                if (a < 0)
                        a = 0;
                if (a > 255)


@@ -94,7 +81,7 @@ schedcpu()
        }
        if (bclnlist != NULL)
                wakeup((caddr_t)&proc[2]);
        }
        if (bclnlist != NULL)
                wakeup((caddr_t)&proc[2]);

-       timeout(schedcpu, 0, hz);
+       timeout(schedcpu, (caddr_t)0, hz);

 }
 
 #define SQSIZE 0100    /* Must be power of 2 */
 }
 
 #define SQSIZE 0100    /* Must be power of 2 */