BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / vm / vm_meter.c

diff --git a/usr/src/sys/vm/vm_meter.c b/usr/src/sys/vm/vm_meter.c
index e108abb..e1dfaa3 100644 (file)
--- a/usr/src/sys/vm/vm_meter.c
+++ b/usr/src/sys/vm/vm_meter.c
@@ -2,17 +2,43 @@
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
  * 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.

  *
  *

- *     @(#)vm_meter.c  7.10 (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.
+ *
+ *     @(#)vm_meter.c  7.11 (Berkeley) 4/20/91

  */
 
 #include "param.h"
  */
 
 #include "param.h"

-#include "systm.h"
-#include "user.h"

 #include "proc.h"
 #include "proc.h"

+#include "systm.h"

 #include "kernel.h"
 #include "kernel.h"

-#include "machine/vmparam.h"
+
+#include "vm_param.h"

 #include "vmmeter.h"
 
 fixpt_t        averunnable[3];         /* load average, of runnable procs */
 #include "vmmeter.h"
 
 fixpt_t        averunnable[3];         /* load average, of runnable procs */


@@ -27,10 +53,8 @@ vmmeter()
 
        if (time.tv_sec % 5 == 0)
                vmtotal();
 
        if (time.tv_sec % 5 == 0)
                vmtotal();

-       if (proc[0].p_slptime > maxslp/2) {
-               runout = 0;
-               wakeup((caddr_t)&runout);
-       }
+       if (proc0.p_slptime > maxslp/2)
+               wakeup((caddr_t)&proc0);

 }
 
 vmtotal()
 }
 
 vmtotal()


@@ -58,9 +82,12 @@ vmtotal()
                                        nrun++;
                                /* fall through */
                        case SSTOP:
                                        nrun++;
                                /* fall through */
                        case SSTOP:

+#ifdef notdef

                                if (p->p_flag & SPAGE)
                                        total.t_pw++;
                                if (p->p_flag & SPAGE)
                                        total.t_pw++;

-                               else if (p->p_flag & SLOAD) {
+                               else
+#endif
+                               if (p->p_flag & SLOAD) {

                                        if (p->p_pri <= PZERO)
                                                total.t_dw++;
                                        else if (p->p_slptime < maxslp)
                                        if (p->p_pri <= PZERO)
                                                total.t_dw++;
                                        else if (p->p_slptime < maxslp)