BSD 4_4_Lite1 release

[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 efc9f73..1c2a578 100644 (file)
--- a/usr/src/sys/kern/kern_synch.c
+++ b/usr/src/sys/kern/kern_synch.c
@@ -1,28 +1,58 @@
 /*-
 /*-

- * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1986, 1990, 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)kern_synch.c        7.24 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)kern_synch.c        8.6 (Berkeley) 1/21/94

  */
 
  */
 

-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "kernel.h"
-#include "buf.h"
-#include "signalvar.h"
-#include "resourcevar.h"
-#include "vmmeter.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/kernel.h>
+#include <sys/buf.h>
+#include <sys/signalvar.h>
+#include <sys/resourcevar.h>
+#include <sys/vmmeter.h>

 #ifdef KTRACE
 #ifdef KTRACE

-#include "ktrace.h"
+#include <sys/ktrace.h>

 #endif
 
 #endif
 

-#include "machine/cpu.h"
+#include <machine/cpu.h>

 
 

-u_char curpri;                 /* usrpri of curproc */
+u_char curpriority;            /* usrpri of curproc */

 int    lbolt;                  /* once a second sleep address */
 
 /*
 int    lbolt;                  /* once a second sleep address */
 
 /*


@@ -35,25 +65,25 @@ roundrobin(arg)
 {
 
        need_resched();
 {
 
        need_resched();

-       timeout(roundrobin, (void *)0, hz / 10);
+       timeout(roundrobin, NULL, hz / 10);

 }
 
 /*
 }
 
 /*

- * constants for digital decay and forget
- *     90% of (p_cpu) usage in 5*loadav time
+ * Constants for digital decay and forget:
+ *     90% of (p_estcpu) usage in 5 * loadav time

  *     95% of (p_pctcpu) usage in 60 seconds (load insensitive)
  *          Note that, as ps(1) mentions, this can let percentages
  *          total over 100% (I've seen 137.9% for 3 processes).
  *
  *     95% of (p_pctcpu) usage in 60 seconds (load insensitive)
  *          Note that, as ps(1) mentions, this can let percentages
  *          total over 100% (I've seen 137.9% for 3 processes).
  *

- * Note that hardclock updates p_cpu and p_cpticks independently.
+ * Note that hardclock updates p_estcpu and p_cpticks independently.

  *
  *

- * We wish to decay away 90% of p_cpu in (5 * loadavg) seconds.
+ * We wish to decay away 90% of p_estcpu in (5 * loadavg) seconds.

  * That is, the system wants to compute a value of decay such
  * that the following for loop:
  *     for (i = 0; i < (5 * loadavg); i++)
  * That is, the system wants to compute a value of decay such
  * that the following for loop:
  *     for (i = 0; i < (5 * loadavg); i++)

- *             p_cpu *= decay;
+ *             p_estcpu *= decay;

  * will compute
  * will compute

- *     p_cpu *= 0.1;
+ *     p_estcpu *= 0.1;

  * for all values of loadavg:
  *
  * Mathematically this loop can be expressed by saying:
  * for all values of loadavg:
  *
  * Mathematically this loop can be expressed by saying:


@@ -124,7 +154,7 @@ fixpt_t     ccpu = 0.95122942450071400909 * FSCALE;         /* exp(-1/20) */
 #define        CCPU_SHIFT      11
 
 /*
 #define        CCPU_SHIFT      11
 
 /*

- * Recompute process priorities, once a second
+ * Recompute process priorities, every hz ticks.

  */
 /* ARGSUSED */
 void
  */
 /* ARGSUSED */
 void


@@ -137,13 +167,13 @@ schedcpu(arg)
        register unsigned int newcpu;
 
        wakeup((caddr_t)&lbolt);
        register unsigned int newcpu;
 
        wakeup((caddr_t)&lbolt);

-       for (p = (struct proc *)allproc; p != NULL; p = p->p_nxt) {
+       for (p = (struct proc *)allproc; p != NULL; p = p->p_next) {

                /*
                 * Increment time in/out of memory and sleep time
                 * (if sleeping).  We ignore overflow; with 16-bit int's
                 * (remember them?) overflow takes 45 days.
                 */
                /*
                 * Increment time in/out of memory and sleep time
                 * (if sleeping).  We ignore overflow; with 16-bit int's
                 * (remember them?) overflow takes 45 days.
                 */

-               p->p_time++;
+               p->p_swtime++;

                if (p->p_stat == SSLEEP || p->p_stat == SSTOP)
                        p->p_slptime++;
                p->p_pctcpu = (p->p_pctcpu * ccpu) >> FSHIFT;
                if (p->p_stat == SSLEEP || p->p_stat == SSTOP)
                        p->p_slptime++;
                p->p_pctcpu = (p->p_pctcpu * ccpu) >> FSHIFT;


@@ -153,6 +183,7 @@ schedcpu(arg)
                 */
                if (p->p_slptime > 1)
                        continue;
                 */
                if (p->p_slptime > 1)
                        continue;

+               s = splstatclock();     /* prevent state changes */

                /*
                 * p_pctcpu is only for ps.
                 */
                /*
                 * p_pctcpu is only for ps.
                 */


@@ -166,21 +197,20 @@ schedcpu(arg)
                        (p->p_cpticks * FSCALE / hz)) >> FSHIFT;
 #endif
                p->p_cpticks = 0;
                        (p->p_cpticks * FSCALE / hz)) >> FSHIFT;
 #endif
                p->p_cpticks = 0;

-               newcpu = (u_int) decay_cpu(loadfac, p->p_cpu) + p->p_nice;
-               p->p_cpu = min(newcpu, UCHAR_MAX);
-               setpri(p);
-               s = splhigh();  /* prevent state changes */
-               if (p->p_pri >= PUSER) {
+               newcpu = (u_int) decay_cpu(loadfac, p->p_estcpu) + p->p_nice;
+               p->p_estcpu = min(newcpu, UCHAR_MAX);
+               resetpriority(p);
+               if (p->p_priority >= PUSER) {

 #define        PPQ     (128 / NQS)             /* priorities per queue */
                        if ((p != curproc) &&
                            p->p_stat == SRUN &&
 #define        PPQ     (128 / NQS)             /* priorities per queue */
                        if ((p != curproc) &&
                            p->p_stat == SRUN &&

-                           (p->p_flag & SLOAD) &&
-                           (p->p_pri / PPQ) != (p->p_usrpri / PPQ)) {
+                           (p->p_flag & P_INMEM) &&
+                           (p->p_priority / PPQ) != (p->p_usrpri / PPQ)) {

                                remrq(p);
                                remrq(p);

-                               p->p_pri = p->p_usrpri;
-                               setrq(p);
+                               p->p_priority = p->p_usrpri;
+                               setrunqueue(p);

                        } else
                        } else

-                               p->p_pri = p->p_usrpri;
+                               p->p_priority = p->p_usrpri;

                }
                splx(s);
        }
                }
                splx(s);
        }


@@ -192,33 +222,38 @@ schedcpu(arg)
 
 /*
  * Recalculate the priority of a process after it has slept for a while.
 
 /*
  * Recalculate the priority of a process after it has slept for a while.

- * For all load averages >= 1 and max p_cpu of 255, sleeping for at least
- * six times the loadfactor will decay p_cpu to zero.
+ * For all load averages >= 1 and max p_estcpu of 255, sleeping for at
+ * least six times the loadfactor will decay p_estcpu to zero.

  */
 void
 updatepri(p)
        register struct proc *p;
 {
  */
 void
 updatepri(p)
        register struct proc *p;
 {

-       register unsigned int newcpu = p->p_cpu;
+       register unsigned int newcpu = p->p_estcpu;

        register fixpt_t loadfac = loadfactor(averunnable.ldavg[0]);
 
        if (p->p_slptime > 5 * loadfac)
        register fixpt_t loadfac = loadfactor(averunnable.ldavg[0]);
 
        if (p->p_slptime > 5 * loadfac)

-               p->p_cpu = 0;
+               p->p_estcpu = 0;

        else {
                p->p_slptime--; /* the first time was done in schedcpu */
                while (newcpu && --p->p_slptime)
                        newcpu = (int) decay_cpu(loadfac, newcpu);
        else {
                p->p_slptime--; /* the first time was done in schedcpu */
                while (newcpu && --p->p_slptime)
                        newcpu = (int) decay_cpu(loadfac, newcpu);

-               p->p_cpu = min(newcpu, UCHAR_MAX);
+               p->p_estcpu = min(newcpu, UCHAR_MAX);

        }
        }

-       setpri(p);
+       resetpriority(p);

 }
 
 }
 

-#define SQSIZE 0100    /* Must be power of 2 */
-#define HASH(x)        (( (int) x >> 5) & (SQSIZE-1))
+/*
+ * We're only looking at 7 bits of the address; everything is
+ * aligned to 4, lots of things are aligned to greater powers
+ * of 2.  Shift right by 8, i.e. drop the bottom 256 worth.
+ */
+#define TABLESIZE      128
+#define LOOKUP(x)      (((int)(x) >> 8) & (TABLESIZE - 1))

 struct slpque {
        struct proc *sq_head;
        struct proc **sq_tailp;
 struct slpque {
        struct proc *sq_head;
        struct proc **sq_tailp;

-} slpque[SQSIZE];
+} slpque[TABLESIZE];

 
 /*
  * During autoconfiguration or after a panic, a sleep will simply
 
 /*
  * During autoconfiguration or after a panic, a sleep will simply


@@ -232,29 +267,26 @@ struct slpque {
 int safepri;
 
 /*
 int safepri;
 
 /*

- * General sleep call.
- * Suspends current process until a wakeup is made on chan.
- * The process will then be made runnable with priority pri.
- * Sleeps at most timo/hz seconds (0 means no timeout).
- * If pri includes PCATCH flag, signals are checked
- * before and after sleeping, else signals are not checked.
- * Returns 0 if awakened, EWOULDBLOCK if the timeout expires.
- * If PCATCH is set and a signal needs to be delivered,
- * ERESTART is returned if the current system call should be restarted
- * if possible, and EINTR is returned if the system call should
- * be interrupted by the signal (return EINTR).
+ * General sleep call.  Suspends the current process until a wakeup is
+ * performed on the specified identifier.  The process will then be made
+ * runnable with the specified priority.  Sleeps at most timo/hz seconds
+ * (0 means no timeout).  If pri includes PCATCH flag, signals are checked
+ * before and after sleeping, else signals are not checked.  Returns 0 if
+ * awakened, EWOULDBLOCK if the timeout expires.  If PCATCH is set and a
+ * signal needs to be delivered, ERESTART is returned if the current system
+ * call should be restarted if possible, and EINTR is returned if the system
+ * call should be interrupted by the signal (return EINTR).

  */
 int
  */
 int

-tsleep(chan, pri, wmesg, timo)
-       void *chan;
-       int pri;
+tsleep(ident, priority, wmesg, timo)
+       void *ident;
+       int priority, timo;

        char *wmesg;
        char *wmesg;

-       int timo;

 {
        register struct proc *p = curproc;
        register struct slpque *qp;
        register s;
 {
        register struct proc *p = curproc;
        register struct slpque *qp;
        register s;

-       int sig, catch = pri & PCATCH;
+       int sig, catch = priority & PCATCH;

        extern int cold;
        void endtsleep __P((void *));
 
        extern int cold;
        void endtsleep __P((void *));
 


@@ -275,19 +307,19 @@ tsleep(chan, pri, wmesg, timo)
                return (0);
        }
 #ifdef DIAGNOSTIC
                return (0);
        }
 #ifdef DIAGNOSTIC

-       if (chan == NULL || p->p_stat != SRUN || p->p_rlink)
+       if (ident == NULL || p->p_stat != SRUN || p->p_back)

                panic("tsleep");
 #endif
                panic("tsleep");
 #endif

-       p->p_wchan = chan;
+       p->p_wchan = ident;

        p->p_wmesg = wmesg;
        p->p_slptime = 0;
        p->p_wmesg = wmesg;
        p->p_slptime = 0;

-       p->p_pri = pri & PRIMASK;
-       qp = &slpque[HASH(chan)];
+       p->p_priority = priority & PRIMASK;
+       qp = &slpque[LOOKUP(ident)];

        if (qp->sq_head == 0)
                qp->sq_head = p;
        else
                *qp->sq_tailp = p;
        if (qp->sq_head == 0)
                qp->sq_head = p;
        else
                *qp->sq_tailp = p;

-       *(qp->sq_tailp = &p->p_link) = 0;
+       *(qp->sq_tailp = &p->p_forw) = 0;

        if (timo)
                timeout(endtsleep, (void *)p, timo);
        /*
        if (timo)
                timeout(endtsleep, (void *)p, timo);
        /*


@@ -300,7 +332,7 @@ tsleep(chan, pri, wmesg, timo)
         * stopped, p->p_wchan will be 0 upon return from CURSIG.
         */
        if (catch) {
         * stopped, p->p_wchan will be 0 upon return from CURSIG.
         */
        if (catch) {

-               p->p_flag |= SSINTR;
+               p->p_flag |= P_SINTR;

                if (sig = CURSIG(p)) {
                        if (p->p_wchan)
                                unsleep(p);
                if (sig = CURSIG(p)) {
                        if (p->p_wchan)
                                unsleep(p);


@@ -315,13 +347,13 @@ tsleep(chan, pri, wmesg, timo)
                sig = 0;
        p->p_stat = SSLEEP;
        p->p_stats->p_ru.ru_nvcsw++;
                sig = 0;
        p->p_stat = SSLEEP;
        p->p_stats->p_ru.ru_nvcsw++;

-       swtch();
+       mi_switch();

 resume:
 resume:

-       curpri = p->p_usrpri;
+       curpriority = p->p_usrpri;

        splx(s);
        splx(s);

-       p->p_flag &= ~SSINTR;
-       if (p->p_flag & STIMO) {
-               p->p_flag &= ~STIMO;
+       p->p_flag &= ~P_SINTR;
+       if (p->p_flag & P_TIMEOUT) {
+               p->p_flag &= ~P_TIMEOUT;

                if (sig == 0) {
 #ifdef KTRACE
                        if (KTRPOINT(p, KTR_CSW))
                if (sig == 0) {
 #ifdef KTRACE
                        if (KTRPOINT(p, KTR_CSW))


@@ -364,10 +396,10 @@ endtsleep(arg)
        s = splhigh();
        if (p->p_wchan) {
                if (p->p_stat == SSLEEP)
        s = splhigh();
        if (p->p_wchan) {
                if (p->p_stat == SSLEEP)

-                       setrun(p);
+                       setrunnable(p);

                else
                        unsleep(p);
                else
                        unsleep(p);

-               p->p_flag |= STIMO;
+               p->p_flag |= P_TIMEOUT;

        }
        splx(s);
 }
        }
        splx(s);
 }


@@ -376,9 +408,9 @@ endtsleep(arg)
  * Short-term, non-interruptable sleep.
  */
 void
  * Short-term, non-interruptable sleep.
  */
 void

-sleep(chan, pri)
-       void *chan;
-       int pri;
+sleep(ident, priority)
+       void *ident;
+       int priority;

 {
        register struct proc *p = curproc;
        register struct slpque *qp;
 {
        register struct proc *p = curproc;
        register struct slpque *qp;


@@ -386,9 +418,9 @@ sleep(chan, pri)
        extern int cold;
 
 #ifdef DIAGNOSTIC
        extern int cold;
 
 #ifdef DIAGNOSTIC

-       if (pri > PZERO) {
-               printf("sleep called with pri %d > PZERO, wchan: %x\n",
-                   pri, chan);
+       if (priority > PZERO) {
+               printf("sleep called with priority %d > PZERO, wchan: %x\n",
+                   priority, ident);

                panic("old sleep");
        }
 #endif
                panic("old sleep");
        }
 #endif


@@ -405,31 +437,31 @@ sleep(chan, pri)
                return;
        }
 #ifdef DIAGNOSTIC
                return;
        }
 #ifdef DIAGNOSTIC

-       if (chan == NULL || p->p_stat != SRUN || p->p_rlink)
+       if (ident == NULL || p->p_stat != SRUN || p->p_back)

                panic("sleep");
 #endif
                panic("sleep");
 #endif

-       p->p_wchan = chan;
+       p->p_wchan = ident;

        p->p_wmesg = NULL;
        p->p_slptime = 0;
        p->p_wmesg = NULL;
        p->p_slptime = 0;

-       p->p_pri = pri;
-       qp = &slpque[HASH(chan)];
+       p->p_priority = priority;
+       qp = &slpque[LOOKUP(ident)];

        if (qp->sq_head == 0)
                qp->sq_head = p;
        else
                *qp->sq_tailp = p;
        if (qp->sq_head == 0)
                qp->sq_head = p;
        else
                *qp->sq_tailp = p;

-       *(qp->sq_tailp = &p->p_link) = 0;
+       *(qp->sq_tailp = &p->p_forw) = 0;

        p->p_stat = SSLEEP;
        p->p_stats->p_ru.ru_nvcsw++;
 #ifdef KTRACE
        if (KTRPOINT(p, KTR_CSW))
                ktrcsw(p->p_tracep, 1, 0);
 #endif
        p->p_stat = SSLEEP;
        p->p_stats->p_ru.ru_nvcsw++;
 #ifdef KTRACE
        if (KTRPOINT(p, KTR_CSW))
                ktrcsw(p->p_tracep, 1, 0);
 #endif

-       swtch();
+       mi_switch();

 #ifdef KTRACE
        if (KTRPOINT(p, KTR_CSW))
                ktrcsw(p->p_tracep, 0, 0);
 #endif
 #ifdef KTRACE
        if (KTRPOINT(p, KTR_CSW))
                ktrcsw(p->p_tracep, 0, 0);
 #endif

-       curpri = p->p_usrpri;
+       curpriority = p->p_usrpri;

        splx(s);
 }
 
        splx(s);
 }
 


@@ -446,11 +478,11 @@ unsleep(p)
 
        s = splhigh();
        if (p->p_wchan) {
 
        s = splhigh();
        if (p->p_wchan) {

-               hp = &(qp = &slpque[HASH(p->p_wchan)])->sq_head;
+               hp = &(qp = &slpque[LOOKUP(p->p_wchan)])->sq_head;

                while (*hp != p)
                while (*hp != p)

-                       hp = &(*hp)->p_link;
-               *hp = p->p_link;
-               if (qp->sq_tailp == &p->p_link)
+                       hp = &(*hp)->p_forw;
+               *hp = p->p_forw;
+               if (qp->sq_tailp == &p->p_forw)

                        qp->sq_tailp = hp;
                p->p_wchan = 0;
        }
                        qp->sq_tailp = hp;
                p->p_wchan = 0;
        }


@@ -458,43 +490,43 @@ unsleep(p)
 }
 
 /*
 }
 
 /*

- * Wakeup on "chan"; set all processes
- * sleeping on chan to run state.
+ * Make all processes sleeping on the specified identifier runnable.

  */
 void
  */
 void

-wakeup(chan)
-       register void *chan;
+wakeup(ident)
+       register void *ident;

 {
        register struct slpque *qp;
        register struct proc *p, **q;
        int s;
 
        s = splhigh();
 {
        register struct slpque *qp;
        register struct proc *p, **q;
        int s;
 
        s = splhigh();

-       qp = &slpque[HASH(chan)];
+       qp = &slpque[LOOKUP(ident)];

 restart:
        for (q = &qp->sq_head; p = *q; ) {
 #ifdef DIAGNOSTIC
 restart:
        for (q = &qp->sq_head; p = *q; ) {
 #ifdef DIAGNOSTIC

-               if (p->p_rlink || p->p_stat != SSLEEP && p->p_stat != SSTOP)
+               if (p->p_back || p->p_stat != SSLEEP && p->p_stat != SSTOP)

                        panic("wakeup");
 #endif
                        panic("wakeup");
 #endif

-               if (p->p_wchan == chan) {
+               if (p->p_wchan == ident) {

                        p->p_wchan = 0;
                        p->p_wchan = 0;

-                       *q = p->p_link;
-                       if (qp->sq_tailp == &p->p_link)
+                       *q = p->p_forw;
+                       if (qp->sq_tailp == &p->p_forw)

                                qp->sq_tailp = q;
                        if (p->p_stat == SSLEEP) {
                                qp->sq_tailp = q;
                        if (p->p_stat == SSLEEP) {

-                               /* OPTIMIZED INLINE EXPANSION OF setrun(p) */
+                               /* OPTIMIZED EXPANSION OF setrunnable(p); */

                                if (p->p_slptime > 1)
                                        updatepri(p);
                                p->p_slptime = 0;
                                p->p_stat = SRUN;
                                if (p->p_slptime > 1)
                                        updatepri(p);
                                p->p_slptime = 0;
                                p->p_stat = SRUN;

-                               if (p->p_flag & SLOAD)
-                                       setrq(p);
+                               if (p->p_flag & P_INMEM)
+                                       setrunqueue(p);

                                /*
                                /*

-                                * Since curpri is a usrpri,
-                                * p->p_pri is always better than curpri.
+                                * Since curpriority is a user priority,
+                                * p->p_priority is always better than
+                                * curpriority.

                                 */
                                 */

-                               if ((p->p_flag&SLOAD) == 0)
+                               if ((p->p_flag & P_INMEM) == 0)

                                        wakeup((caddr_t)&proc0);
                                else
                                        need_resched();
                                        wakeup((caddr_t)&proc0);
                                else
                                        need_resched();


@@ -502,17 +534,17 @@ restart:
                                goto restart;
                        }
                } else
                                goto restart;
                        }
                } else

-                       q = &p->p_link;
+                       q = &p->p_forw;

        }
        splx(s);
 }
 
 /*
        }
        splx(s);
 }
 
 /*

- * The machine independent parts of swtch().
+ * The machine independent parts of mi_switch().

  * Must be called at splstatclock() or higher.
  */
 void
  * Must be called at splstatclock() or higher.
  */
 void

-swtch()
+mi_switch()

 {
        register struct proc *p = curproc;      /* XXX */
        register struct rlimit *rlim;
 {
        register struct proc *p = curproc;      /* XXX */
        register struct rlimit *rlim;


@@ -553,14 +585,14 @@ swtch()
        }
        if (s > 10 * 60 && p->p_ucred->cr_uid && p->p_nice == NZERO) {
                p->p_nice = NZERO + 4;
        }
        if (s > 10 * 60 && p->p_ucred->cr_uid && p->p_nice == NZERO) {
                p->p_nice = NZERO + 4;

-               setpri(p);
+               resetpriority(p);

        }
 
        /*
         * Pick a new current process and record its start time.
         */
        cnt.v_swtch++;
        }
 
        /*
         * Pick a new current process and record its start time.
         */
        cnt.v_swtch++;

-       cpu_swtch(p);
+       cpu_switch(p);

        microtime(&runtime);
 }
 
        microtime(&runtime);
 }
 


@@ -582,21 +614,18 @@ rqinit()
  * and awakening the swapper if it isn't in memory.
  */
 void
  * and awakening the swapper if it isn't in memory.
  */
 void

-setrun(p)
+setrunnable(p)

        register struct proc *p;
 {
        register int s;
 
        s = splhigh();
        switch (p->p_stat) {
        register struct proc *p;
 {
        register int s;
 
        s = splhigh();
        switch (p->p_stat) {

-

        case 0:
        case 0:

-       case SWAIT:

        case SRUN:
        case SZOMB:
        default:
        case SRUN:
        case SZOMB:
        default:

-               panic("setrun");
-
+               panic("setrunnable");

        case SSTOP:
        case SSLEEP:
                unsleep(p);             /* e.g. when sending signals */
        case SSTOP:
        case SSLEEP:
                unsleep(p);             /* e.g. when sending signals */


@@ -606,32 +635,32 @@ setrun(p)
                break;
        }
        p->p_stat = SRUN;
                break;
        }
        p->p_stat = SRUN;

-       if (p->p_flag & SLOAD)
-               setrq(p);
+       if (p->p_flag & P_INMEM)
+               setrunqueue(p);

        splx(s);
        if (p->p_slptime > 1)
                updatepri(p);
        p->p_slptime = 0;
        splx(s);
        if (p->p_slptime > 1)
                updatepri(p);
        p->p_slptime = 0;

-       if ((p->p_flag&SLOAD) == 0)
+       if ((p->p_flag & P_INMEM) == 0)

                wakeup((caddr_t)&proc0);
                wakeup((caddr_t)&proc0);

-       else if (p->p_pri < curpri)
+       else if (p->p_priority < curpriority)

                need_resched();
 }
 
 /*
                need_resched();
 }
 
 /*

- * Compute priority of process when running in user mode.
- * Arrange to reschedule if the resulting priority
- * is better than that of the current process.
+ * Compute the priority of a process when running in user mode.
+ * Arrange to reschedule if the resulting priority is better
+ * than that of the current process.

  */
 void
  */
 void

-setpri(p)
+resetpriority(p)

        register struct proc *p;
 {
        register struct proc *p;
 {

-       register unsigned int newpri;
+       register unsigned int newpriority;

 
 

-       newpri = PUSER + p->p_cpu / 4 + 2 * p->p_nice;
-       newpri = min(newpri, MAXPRI);
-       p->p_usrpri = newpri;
-       if (newpri < curpri)
+       newpriority = PUSER + p->p_estcpu / 4 + 2 * p->p_nice;
+       newpriority = min(newpriority, MAXPRI);
+       p->p_usrpri = newpriority;
+       if (newpriority < curpriority)

                need_resched();
 }
                need_resched();
 }