update from Rick Macklem to generate proper error messages

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

diff --git a/usr/src/sys/kern/kern_clock.c b/usr/src/sys/kern/kern_clock.c
index 3c7879a..c8dfcce 100644 (file)
--- a/usr/src/sys/kern/kern_clock.c
+++ b/usr/src/sys/kern/kern_clock.c
@@ -1,27 +1,27 @@
 /*
 /*

- * Copyright (c) 1982 Regents of the University of California.
+ * Copyright (c) 1982, 1986 Regents of the University of California.

  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)kern_clock.c        6.13 (Berkeley) %G%
+ *     @(#)kern_clock.c        7.5 (Berkeley) %G%

  */
 
  */
 

-#include "../machine/reg.h"
-#include "../machine/psl.h"
-

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

-#include "dk.h"
+#include "dkstat.h"

 #include "callout.h"
 #include "callout.h"

-#include "dir.h"

 #include "user.h"
 #include "kernel.h"
 #include "proc.h"
 #include "vm.h"
 #include "text.h"
 
 #include "user.h"
 #include "kernel.h"
 #include "proc.h"
 #include "vm.h"
 #include "text.h"
 

-#ifdef vax
-#include "../vax/mtpr.h"
+#include "machine/reg.h"
+#include "machine/psl.h"
+
+#if defined(vax) || defined(tahoe)
+#include "machine/mtpr.h"
+#include "machine/clock.h"

 #endif
 
 #ifdef GPROF
 #endif
 
 #ifdef GPROF


@@ -52,22 +52,10 @@ int adjtimedelta;
  *     time of day, system/user timing, timeouts, profiling on separate timers
  *     allocate more timeout table slots when table overflows.
  */
  *     time of day, system/user timing, timeouts, profiling on separate timers
  *     allocate more timeout table slots when table overflows.
  */

-#ifdef notdef
+

 /*
  * Bump a timeval by a small number of usec's.
  */
 /*
  * Bump a timeval by a small number of usec's.
  */

-bumptime(tp, usec)
-       register struct timeval *tp;
-       int usec;
-{
-
-       tp->tv_usec += usec;
-       if (tp->tv_usec >= 1000000) {
-               tp->tv_usec -= 1000000;
-               tp->tv_sec++;
-       }
-}
-#endif notdef

 #define BUMPTIME(t, usec) { \
        register struct timeval *tp = (t); \
  \
 #define BUMPTIME(t, usec) { \
        register struct timeval *tp = (t); \
  \


@@ -91,7 +79,7 @@ hardclock(pc, ps)
 {
        register struct callout *p1;
        register struct proc *p;
 {
        register struct callout *p1;
        register struct proc *p;

-       register int s, cpstate;
+       register int s;

 
        /*
         * Update real-time timeout queue.
 
        /*
         * Update real-time timeout queue.


@@ -128,29 +116,12 @@ hardclock(pc, ps)
                if (timerisset(&u.u_timer[ITIMER_VIRTUAL].it_value) &&
                    itimerdecr(&u.u_timer[ITIMER_VIRTUAL], tick) == 0)
                        psignal(u.u_procp, SIGVTALRM);
                if (timerisset(&u.u_timer[ITIMER_VIRTUAL].it_value) &&
                    itimerdecr(&u.u_timer[ITIMER_VIRTUAL], tick) == 0)
                        psignal(u.u_procp, SIGVTALRM);

-               if (u.u_procp->p_nice > NZERO)
-                       cpstate = CP_NICE;
-               else
-                       cpstate = CP_USER;

        } else {
                /*
        } else {
                /*

-                * CPU was in system state.  If profiling kernel
-                * increment a counter.  If no process is running
-                * then this is a system tick if we were running
-                * at a non-zero IPL (in a driver).  If a process is running,
-                * then we charge it with system time even if we were
-                * at a non-zero IPL, since the system often runs
-                * this way during processing of system calls.
-                * This is approximate, but the lack of true interval
-                * timers makes doing anything else difficult.
+                * CPU was in system state.

                 */
                 */

-               cpstate = CP_SYS;
-               if (noproc) {
-                       if (BASEPRI(ps))
-                               cpstate = CP_IDLE;
-               } else {
+               if (!noproc)

                        BUMPTIME(&u.u_ru.ru_stime, tick);
                        BUMPTIME(&u.u_ru.ru_stime, tick);

-               }

        }
 
        /*
        }
 
        /*


@@ -173,7 +144,10 @@ hardclock(pc, ps)
                    itimerdecr(&u.u_timer[ITIMER_PROF], tick) == 0)
                        psignal(u.u_procp, SIGPROF);
                s = u.u_procp->p_rssize;
                    itimerdecr(&u.u_timer[ITIMER_PROF], tick) == 0)
                        psignal(u.u_procp, SIGPROF);
                s = u.u_procp->p_rssize;

-               u.u_ru.ru_idrss += s; u.u_ru.ru_isrss += 0;     /* XXX */
+               u.u_ru.ru_idrss += s;
+#ifdef notdef
+               u.u_ru.ru_isrss += 0;           /* XXX (haven't got this) */
+#endif

                if (u.u_procp->p_textp) {
                        register int xrss = u.u_procp->p_textp->x_rssize;
 
                if (u.u_procp->p_textp) {
                        register int xrss = u.u_procp->p_textp->x_rssize;
 


@@ -236,17 +210,17 @@ hardclock(pc, ps)
                }
        }
 #else
                }
        }
 #else

-       if (adjtimedelta == 0)
+       if (timedelta == 0)

                BUMPTIME(&time, tick)
        else {
                register delta;
 
                BUMPTIME(&time, tick)
        else {
                register delta;
 

-               if (adjtimedelta < 0) {
-                       delta = tick - tickadj;
-                       adjtimedelta += tickadj;
+               if (timedelta < 0) {
+                       delta = tick - tickdelta;
+                       timedelta += tickdelta;

                } else {
                } else {

-                       delta = tick + tickadj;
-                       adjtimedelta -= tickadj;
+                       delta = tick + tickdelta;
+                       timedelta -= tickdelta;

                }
                BUMPTIME(&time, delta);
        }
                }
                BUMPTIME(&time, delta);
        }


@@ -268,7 +242,7 @@ gatherstats(pc, ps)
        caddr_t pc;
        int ps;
 {
        caddr_t pc;
        int ps;
 {

-       int cpstate, s;
+       register int cpstate, s;

 
        /*
         * Determine what state the cpu is in.
 
        /*
         * Determine what state the cpu is in.


@@ -284,7 +258,14 @@ gatherstats(pc, ps)
        } else {
                /*
                 * CPU was in system state.  If profiling kernel
        } else {
                /*
                 * CPU was in system state.  If profiling kernel

-                * increment a counter.
+                * increment a counter.  If no process is running
+                * then this is a system tick if we were running
+                * at a non-zero IPL (in a driver).  If a process is running,
+                * then we charge it with system time even if we were
+                * at a non-zero IPL, since the system often runs
+                * this way during processing of system calls.
+                * This is approximate, but the lack of true interval
+                * timers makes doing anything else difficult.

                 */
                cpstate = CP_SYS;
                if (noproc && BASEPRI(ps))
                 */
                cpstate = CP_SYS;
                if (noproc && BASEPRI(ps))


@@ -322,7 +303,7 @@ softclock(pc, ps)
                register int (*func)();
                register int a, s;
 
                register int (*func)();
                register int a, s;
 

-               s = spl7();
+               s = splhigh();

                if ((p1 = calltodo.c_next) == 0 || p1->c_time > 0) {
                        splx(s);
                        break;
                if ((p1 = calltodo.c_next) == 0 || p1->c_time > 0) {
                        splx(s);
                        break;


@@ -368,7 +349,7 @@ timeout(fun, arg, t)
        register int t;
 {
        register struct callout *p1, *p2, *pnew;
        register int t;
 {
        register struct callout *p1, *p2, *pnew;

-       register int s = spl7();
+       register int s = splhigh();

 
        if (t <= 0)
                t = 1;
 
        if (t <= 0)
                t = 1;


@@ -400,7 +381,7 @@ untimeout(fun, arg)
        register struct callout *p1, *p2;
        register int s;
 
        register struct callout *p1, *p2;
        register int s;
 

-       s = spl7();
+       s = splhigh();

        for (p1 = &calltodo; (p2 = p1->c_next) != 0; p1 = p2) {
                if (p2->c_func == fun && p2->c_arg == arg) {
                        if (p2->c_next && p2->c_time > 0)
        for (p1 = &calltodo; (p2 = p1->c_next) != 0; p1 = p2) {
                if (p2->c_func == fun && p2->c_arg == arg) {
                        if (p2->c_next && p2->c_time > 0)


@@ -424,7 +405,7 @@ hzto(tv)
 {
        register long ticks;
        register long sec;
 {
        register long ticks;
        register long sec;

-       int s = spl7();
+       int s = splhigh();

 
        /*
         * If number of milliseconds will fit in 32 bit arithmetic,
 
        /*
         * If number of milliseconds will fit in 32 bit arithmetic,


@@ -462,10 +443,3 @@ profil()
        upp->pr_off = uap->pcoffset;
        upp->pr_scale = uap->pcscale;
 }
        upp->pr_off = uap->pcoffset;
        upp->pr_scale = uap->pcscale;
 }

-
-opause()
-{
-
-       for (;;)
-               sleep((caddr_t)&u, PSLEP);
-}