BSD 4_3_Net_2 release

[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 61c7d95..e5291f2 100644 (file)
--- a/usr/src/sys/kern/kern_time.c
+++ b/usr/src/sys/kern/kern_time.c
@@ -2,30 +2,42 @@
  * 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.
  *

- * Redistribution is only permitted until one year after the first shipment
- * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
- * binary forms are permitted provided that: (1) source distributions retain
- * this entire copyright notice and comment, and (2) distributions including
- * binaries display the following acknowledgement:  This product includes
- * software developed by the University of California, Berkeley and its
- * contributors'' in the documentation or other materials provided with the
- * distribution and in all advertising materials mentioning features or use
- * of this software.  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.
- * THIS SOFTWARE IS PROVIDED AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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_time.c 7.13 (Berkeley) 6/28/90
+ * 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_time.c 7.15 (Berkeley) 3/17/91

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

-#include "user.h"
+#include "resourcevar.h"

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

-#include "machine/reg.h"

 #include "machine/cpu.h"
 
 /* 
 #include "machine/cpu.h"
 
 /* 


@@ -62,6 +74,7 @@ gettimeofday(p, uap, retval)
        return (error);
 }
 
        return (error);
 }
 

+/* ARGSUSED */

 settimeofday(p, uap, retval)
        struct proc *p;
        struct args {
 settimeofday(p, uap, retval)
        struct proc *p;
        struct args {


@@ -74,7 +87,7 @@ settimeofday(p, uap, retval)
        struct timezone atz;
        int error, s;
 
        struct timezone atz;
        int error, s;
 

-       if (error = suser(u.u_cred, &u.u_acflag))
+       if (error = suser(p->p_ucred, &p->p_acflag))

                return (error);
        if (uap->tv) {
                if (error = copyin((caddr_t)uap->tv, (caddr_t)&atv,
                return (error);
        if (uap->tv) {
                if (error = copyin((caddr_t)uap->tv, (caddr_t)&atv,


@@ -109,7 +122,7 @@ adjtime(p, uap, retval)
        register long ndelta;
        int s, error;
 
        register long ndelta;
        int s, error;
 

-       if (error = suser(u.u_cred, &u.u_acflag))
+       if (error = suser(p->p_ucred, &p->p_acflag))

                return (error);
        if (error =
            copyin((caddr_t)uap->delta, (caddr_t)&atv, sizeof (struct timeval)))
                return (error);
        if (error =
            copyin((caddr_t)uap->delta, (caddr_t)&atv, sizeof (struct timeval)))


@@ -139,7 +152,7 @@ adjtime(p, uap, retval)
 
 /*
  * Get value of an interval timer.  The process virtual and
 
 /*
  * Get value of an interval timer.  The process virtual and

- * profiling virtual time timers are kept in the u. area, since
+ * profiling virtual time timers are kept in the p_stats area, since

  * they can be swapped out.  These are kept internally in the
  * way they are specified externally: in time until they expire.
  *
  * they can be swapped out.  These are kept internally in the
  * way they are specified externally: in time until they expire.
  *


@@ -187,7 +200,7 @@ getitimer(p, uap, retval)
                        else
                                timevalsub(&aitv.it_value, &time);
        } else
                        else
                                timevalsub(&aitv.it_value, &time);
        } else

-               aitv = u.u_timer[uap->which];
+               aitv = p->p_stats->p_timer[uap->which];

        splx(s);
        return (copyout((caddr_t)&aitv, (caddr_t)uap->itv,
            sizeof (struct itimerval)));
        splx(s);
        return (copyout((caddr_t)&aitv, (caddr_t)uap->itv,
            sizeof (struct itimerval)));


@@ -227,7 +240,7 @@ setitimer(p, uap, retval)
                }
                p->p_realtimer = aitv;
        } else
                }
                p->p_realtimer = aitv;
        } else

-               u.u_timer[uap->which] = aitv;
+               p->p_stats->p_timer[uap->which] = aitv;

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