BSD 4_4 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..609100b 100644 (file)
--- a/usr/src/sys/kern/kern_synch.c
+++ b/usr/src/sys/kern/kern_synch.c
@@ -1,26 +1,52 @@
 /*-
 /*-

- * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
- * Copyright (c) 1991 The Regents of the University of California.
+ * Copyright (c) 1982, 1986, 1990, 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.

  * All rights reserved.
  *
  * All rights reserved.
  *

- * %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.1 (Berkeley) 6/10/93

  */
 
  */
 

-#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 */
 int    lbolt;                  /* once a second sleep address */
 
 u_char curpri;                 /* usrpri of curproc */
 int    lbolt;                  /* once a second sleep address */


@@ -153,6 +179,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.
                 */


@@ -169,7 +196,6 @@ schedcpu(arg)
                newcpu = (u_int) decay_cpu(loadfac, p->p_cpu) + p->p_nice;
                p->p_cpu = min(newcpu, UCHAR_MAX);
                setpri(p);
                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) {
 #define        PPQ     (128 / NQS)             /* priorities per queue */
                        if ((p != curproc) &&
                if (p->p_pri >= PUSER) {
 #define        PPQ     (128 / NQS)             /* priorities per queue */
                        if ((p != curproc) &&