rm extraneous splx

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

diff --git a/usr/src/sys/kern/kern_time.c b/usr/src/sys/kern/kern_time.c
index 30ba980..7f2dfbc 100644 (file)
--- a/usr/src/sys/kern/kern_time.c
+++ b/usr/src/sys/kern/kern_time.c
@@ -1,15 +1,28 @@
-/*     kern_time.c     5.5     82/09/08        */
+/*
+ * 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.
+ *
+ *     @(#)kern_time.c 7.2 (Berkeley) %G%
+ */
+
+#include "../machine/reg.h"

 
 

-#include "../h/param.h"
-#include "../h/dir.h"          /* XXX */
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/reg.h"
-#include "../h/inode.h"
-#include "../h/proc.h"
+#include "param.h"
+#include "dir.h"               /* XXX */
+#include "user.h"
+#include "kernel.h"
+#include "inode.h"
+#include "proc.h"

 
 /* 
  * Time of day and interval timer support.
 
 /* 
  * Time of day and interval timer support.

+ *
+ * These routines provide the kernel entry points to get and set
+ * the time-of-day and per-process interval timers.  Subroutines
+ * here provide support for adding and subtracting timeval structures
+ * and decrementing interval timers, optionally reloading the interval
+ * timers when they expire.

  */
 
 gettimeofday()
  */
 
 gettimeofday()


@@ -19,20 +32,15 @@ gettimeofday()
                struct  timezone *tzp;
        } *uap = (struct a *)u.u_ap;
        struct timeval atv;
                struct  timezone *tzp;
        } *uap = (struct a *)u.u_ap;
        struct timeval atv;

-       int s;

 
 

-       s = spl7(); atv = time; splx(s);
-       if (copyout((caddr_t)&atv, (caddr_t)uap->tp, sizeof (atv))) {
-               u.u_error = EFAULT;
+       microtime(&atv);
+       u.u_error = copyout((caddr_t)&atv, (caddr_t)uap->tp, sizeof (atv));
+       if (u.u_error)

                return;
                return;

-       }

        if (uap->tzp == 0)
                return;
        /* SHOULD HAVE PER-PROCESS TIMEZONE */
        if (uap->tzp == 0)
                return;
        /* SHOULD HAVE PER-PROCESS TIMEZONE */

-       if (copyout((caddr_t)&tz, uap->tzp, sizeof (tz))) {
-               u.u_error = EFAULT;
-               return;
-       }
+       u.u_error = copyout((caddr_t)&tz, (caddr_t)uap->tzp, sizeof (tz));

 }
 
 settimeofday()
 }
 
 settimeofday()


@@ -44,64 +52,96 @@ settimeofday()
        struct timeval atv;
        struct timezone atz;
 
        struct timeval atv;
        struct timezone atz;
 

-       if (copyin((caddr_t)uap->tv, (caddr_t)&atv, sizeof (struct timeval))) {
-               u.u_error = EFAULT;
+       u.u_error = copyin((caddr_t)uap->tv, (caddr_t)&atv,
+               sizeof (struct timeval));
+       if (u.u_error)

                return;
                return;

-       }

        setthetime(&atv);
        if (uap->tzp && suser()) {
        setthetime(&atv);
        if (uap->tzp && suser()) {

-               if (copyin((caddr_t)uap->tzp, (caddr_t)&atz, sizeof (atz))) {
-                       u.u_error = EFAULT;
-                       return;
-               }
+               u.u_error = copyin((caddr_t)uap->tzp, (caddr_t)&atz,
+                       sizeof (atz));
+               if (u.u_error == 0)
+                       tz = atz;

        }
 }
 
 setthetime(tv)
        struct timeval *tv;
 {
        }
 }
 
 setthetime(tv)
        struct timeval *tv;
 {

-       register int delta;

        int s;
 
        if (!suser())
                return;
        int s;
 
        if (!suser())
                return;

+/* WHAT DO WE DO ABOUT PENDING REAL-TIME TIMEOUTS??? */

        boottime.tv_sec += tv->tv_sec - time.tv_sec;
        boottime.tv_sec += tv->tv_sec - time.tv_sec;

-       s = spl7(); time = *tv; splx(s);
-       clockset();
+       s = splhigh(); time = *tv; splx(s);
+       resettodr();

 }
 
 }
 

-timevaladd(t1, t2)
-       struct timeval *t1, *t2;
-{
+extern int tickadj;                    /* "standard" clock skew, us./tick */
+int    tickdelta;                      /* current clock skew, us. per tick */
+long   timedelta;                      /* unapplied time correction, us. */
+long   bigadj = 1000000;               /* use 10x skew above bigadj us. */

 
 

-       t1->tv_sec += t2->tv_sec;
-       t1->tv_usec += t2->tv_usec;
-       timevalfix(t1);
-}
-
-timevalsub(t1, t2)
-       struct timeval *t1, *t2;
+adjtime()

 {
 {

+       register struct a {
+               struct timeval *delta;
+               struct timeval *olddelta;
+       } *uap = (struct a *)u.u_ap;
+       struct timeval atv, oatv;
+       register long ndelta;
+       int s;

 
 

-       t1->tv_sec -= t2->tv_sec;
-       t1->tv_usec -= t2->tv_usec;
-       timevalfix(t1);
-}
-
-timevalfix(t1)
-       struct timeval *t1;
-{
+       if (!suser()) 
+               return;
+       u.u_error = copyin((caddr_t)uap->delta, (caddr_t)&atv,
+               sizeof (struct timeval));
+       if (u.u_error)
+               return;
+       ndelta = atv.tv_sec * 1000000 + atv.tv_usec;
+       if (timedelta == 0)
+               if (ndelta > bigadj)
+                       tickdelta = 10 * tickadj;
+               else
+                       tickdelta = tickadj;
+       if (ndelta % tickdelta)
+               ndelta = ndelta / tickadj * tickadj;

 
 

-       if (t1->tv_usec < 0) {
-               t1->tv_sec--;
-               t1->tv_usec += 1000000;
-       }
-       if (t1->tv_usec >= 1000000) {
-               t1->tv_sec++;
-               t1->tv_usec -= 1000000;
+       s = splclock();
+       if (uap->olddelta) {
+               oatv.tv_sec = timedelta / 1000000;
+               oatv.tv_usec = timedelta % 1000000;

        }
        }

+       timedelta = ndelta;
+       splx(s);
+
+       if (uap->olddelta)
+               (void) copyout((caddr_t)&oatv, (caddr_t)uap->olddelta,
+                       sizeof (struct timeval));

 }
 
 }
 

+/*
+ * Get value of an interval timer.  The process virtual and
+ * profiling virtual time timers are kept in the u. area, since
+ * they can be swapped out.  These are kept internally in the
+ * way they are specified externally: in time until they expire.
+ *
+ * The real time interval timer is kept in the process table slot
+ * for the process, and its value (it_value) is kept as an
+ * absolute time rather than as a delta, so that it is easy to keep
+ * periodic real-time signals from drifting.
+ *
+ * Virtual time timers are processed in the hardclock() routine of
+ * kern_clock.c.  The real time timer is processed by a timeout
+ * routine, called from the softclock() routine.  Since a callout
+ * may be delayed in real time due to interrupt processing in the system,
+ * it is possible for the real time timeout routine (realitexpire, given below),
+ * to be delayed in real time past when it is supposed to occur.  It
+ * does not suffice, therefore, to reload the real timer .it_value from the
+ * real time timers .it_interval.  Rather, we compute the next time in
+ * absolute time the timer should go off.
+ */

 getitimer()
 {
        register struct a {
 getitimer()
 {
        register struct a {


@@ -115,8 +155,14 @@ getitimer()
                u.u_error = EINVAL;
                return;
        }
                u.u_error = EINVAL;
                return;
        }

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

        if (uap->which == ITIMER_REAL) {
        if (uap->which == ITIMER_REAL) {

+               /*
+                * Convert from absoulte to relative time in .it_value
+                * part of real time timer.  If time for real time timer
+                * has passed return 0, else return difference between
+                * current time and time for the timer to go off.
+                */

                aitv = u.u_procp->p_realtimer;
                if (timerisset(&aitv.it_value))
                        if (timercmp(&aitv.it_value, &time, <))
                aitv = u.u_procp->p_realtimer;
                if (timerisset(&aitv.it_value))
                        if (timercmp(&aitv.it_value, &time, <))


@@ -126,9 +172,8 @@ getitimer()
        } else
                aitv = u.u_timer[uap->which];
        splx(s);
        } else
                aitv = u.u_timer[uap->which];
        splx(s);

-       if (copyout((caddr_t)&aitv, uap->itv, sizeof (struct itimerval)))
-               u.u_error = EFAULT;
-       splx(s);
+       u.u_error = copyout((caddr_t)&aitv, (caddr_t)uap->itv,
+           sizeof (struct itimerval));

 }
 
 setitimer()
 }
 
 setitimer()


@@ -137,7 +182,7 @@ setitimer()
                u_int   which;
                struct  itimerval *itv, *oitv;
        } *uap = (struct a *)u.u_ap;
                u_int   which;
                struct  itimerval *itv, *oitv;
        } *uap = (struct a *)u.u_ap;

-       struct itimerval aitv;
+       struct itimerval aitv, *aitvp;

        int s;
        register struct proc *p = u.u_procp;
 
        int s;
        register struct proc *p = u.u_procp;
 


@@ -145,25 +190,27 @@ setitimer()
                u.u_error = EINVAL;
                return;
        }
                u.u_error = EINVAL;
                return;
        }

-       if (copyin((caddr_t)uap->itv, (caddr_t)&aitv,
-           sizeof (struct itimerval))) {
-               u.u_error = EFAULT;
-               return;
-       }
+       aitvp = uap->itv;

        if (uap->oitv) {
                uap->itv = uap->oitv;
                getitimer();
        }
        if (uap->oitv) {
                uap->itv = uap->oitv;
                getitimer();
        }

+       if (aitvp == 0)
+               return;
+       u.u_error = copyin((caddr_t)aitvp, (caddr_t)&aitv,
+           sizeof (struct itimerval));
+       if (u.u_error)
+               return;

        if (itimerfix(&aitv.it_value) || itimerfix(&aitv.it_interval)) {
                u.u_error = EINVAL;
                return;
        }
        if (itimerfix(&aitv.it_value) || itimerfix(&aitv.it_interval)) {
                u.u_error = EINVAL;
                return;
        }

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

        if (uap->which == ITIMER_REAL) {
        if (uap->which == ITIMER_REAL) {

-               untimeout(unrto, p);
+               untimeout(realitexpire, (caddr_t)p);

                if (timerisset(&aitv.it_value)) {
                        timevaladd(&aitv.it_value, &time);
                if (timerisset(&aitv.it_value)) {
                        timevaladd(&aitv.it_value, &time);

-                       timeout(unrto, p, hzto(&aitv.it_value));
+                       timeout(realitexpire, (caddr_t)p, hzto(&aitv.it_value));

                }
                p->p_realtimer = aitv;
        } else
                }
                p->p_realtimer = aitv;
        } else


@@ -171,7 +218,15 @@ setitimer()
        splx(s);
 }
 
        splx(s);
 }
 

-unrto(p)
+/*
+ * Real interval timer expired:
+ * send process whose timer expired an alarm signal.
+ * If time is not set up to reload, then just return.
+ * Else compute next time timer should go off which is > current time.
+ * This is where delay in processing this timeout causes multiple
+ * SIGALRM calls to be compressed into one.
+ */
+realitexpire(p)

        register struct proc *p;
 {
        int s;
        register struct proc *p;
 {
        int s;


@@ -182,11 +237,12 @@ unrto(p)
                return;
        }
        for (;;) {
                return;
        }
        for (;;) {

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

                timevaladd(&p->p_realtimer.it_value,
                    &p->p_realtimer.it_interval);
                if (timercmp(&p->p_realtimer.it_value, &time, >)) {
                timevaladd(&p->p_realtimer.it_value,
                    &p->p_realtimer.it_interval);
                if (timercmp(&p->p_realtimer.it_value, &time, >)) {

-                       timeout(unrto, p, hzto(&p->p_realtimer.it_value));
+                       timeout(realitexpire, (caddr_t)p,
+                           hzto(&p->p_realtimer.it_value));

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


@@ -194,6 +250,12 @@ unrto(p)
        }
 }
 
        }
 }
 

+/*
+ * Check that a proposed value to load into the .it_value or
+ * .it_interval part of an interval timer is acceptable, and
+ * fix it to have at least minimal value (i.e. if it is less
+ * than the resolution of the clock, round it up.)
+ */

 itimerfix(tv)
        struct timeval *tv;
 {
 itimerfix(tv)
        struct timeval *tv;
 {


@@ -201,11 +263,21 @@ itimerfix(tv)
        if (tv->tv_sec < 0 || tv->tv_sec > 100000000 ||
            tv->tv_usec < 0 || tv->tv_usec >= 1000000)
                return (EINVAL);
        if (tv->tv_sec < 0 || tv->tv_sec > 100000000 ||
            tv->tv_usec < 0 || tv->tv_usec >= 1000000)
                return (EINVAL);

-       if (tv->tv_sec == 0 && tv->tv_usec < tick)
+       if (tv->tv_sec == 0 && tv->tv_usec != 0 && tv->tv_usec < tick)

                tv->tv_usec = tick;
        return (0);
 }
 
                tv->tv_usec = tick;
        return (0);
 }
 

+/*
+ * Decrement an interval timer by a specified number
+ * of microseconds, which must be less than a second,
+ * i.e. < 1000000.  If the timer expires, then reload
+ * it.  In this case, carry over (usec - old value) to
+ * reducint the value reloaded into the timer so that
+ * the timer does not drift.  This routine assumes
+ * that it is called in a context where the timers
+ * on which it is operating cannot change in value.
+ */

 itimerdecr(itp, usec)
        register struct itimerval *itp;
        int usec;
 itimerdecr(itp, usec)
        register struct itimerval *itp;
        int usec;


@@ -213,6 +285,7 @@ itimerdecr(itp, usec)
 
        if (itp->it_value.tv_usec < usec) {
                if (itp->it_value.tv_sec == 0) {
 
        if (itp->it_value.tv_usec < usec) {
                if (itp->it_value.tv_sec == 0) {

+                       /* expired, and already in next interval */

                        usec -= itp->it_value.tv_usec;
                        goto expire;
                }
                        usec -= itp->it_value.tv_usec;
                        goto expire;
                }


@@ -223,6 +296,7 @@ itimerdecr(itp, usec)
        usec = 0;
        if (timerisset(&itp->it_value))
                return (1);
        usec = 0;
        if (timerisset(&itp->it_value))
                return (1);

+       /* expired, exactly at end of interval */

 expire:
        if (timerisset(&itp->it_interval)) {
                itp->it_value = itp->it_interval;
 expire:
        if (timerisset(&itp->it_interval)) {
                itp->it_value = itp->it_interval;


@@ -232,46 +306,45 @@ expire:
                        itp->it_value.tv_sec--;
                }
        } else
                        itp->it_value.tv_sec--;
                }
        } else

-               itp->it_value.tv_usec = 0;
+               itp->it_value.tv_usec = 0;              /* sec is already 0 */

        return (0);
 }
 
        return (0);
 }
 

-#ifndef NOCOMPAT
-otime()
+/*
+ * Add and subtract routines for timevals.
+ * N.B.: subtract routine doesn't deal with
+ * results which are before the beginning,
+ * it just gets very confused in this case.
+ * Caveat emptor.
+ */
+timevaladd(t1, t2)
+       struct timeval *t1, *t2;

 {
 
 {
 

-       u.u_r.r_time = time.tv_sec;
+       t1->tv_sec += t2->tv_sec;
+       t1->tv_usec += t2->tv_usec;
+       timevalfix(t1);

 }
 
 }
 

-ostime()
+timevalsub(t1, t2)
+       struct timeval *t1, *t2;

 {
 {

-       register struct a {
-               int     time;
-       } *uap = (struct a *)u.u_ap;
-       struct timeval tv;

 
 

-       tv.tv_sec = uap->time;
-       tv.tv_usec = 0;
-       setthetime(&tv);
+       t1->tv_sec -= t2->tv_sec;
+       t1->tv_usec -= t2->tv_usec;
+       timevalfix(t1);

 }
 
 }
 

-#include "../h/timeb.h"
-
-oftime()
+timevalfix(t1)
+       struct timeval *t1;

 {
 {

-       register struct a {
-               struct  timeb   *tp;
-       } *uap;
-       struct timeb t;

 
 

-       uap = (struct a *)u.u_ap;
-       (void) spl7();
-       t.time = time.tv_sec;
-       t.millitm = time.tv_usec / 1000;
-       (void) spl0();
-       t.timezone = tz.tz_minuteswest;
-       t.dstflag = tz.tz_dsttime;
-       if (copyout((caddr_t)&t, (caddr_t)uap->tp, sizeof(t)) < 0)
-               u.u_error = EFAULT;
+       if (t1->tv_usec < 0) {
+               t1->tv_sec--;
+               t1->tv_usec += 1000000;
+       }
+       if (t1->tv_usec >= 1000000) {
+               t1->tv_sec++;
+               t1->tv_usec -= 1000000;
+       }

 }
 }

-#endif