make kernel includes standard

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

diff --git a/usr/src/sys/kern/kern_acct.c b/usr/src/sys/kern/kern_acct.c
index 6145e7a..7be6272 100644 (file)
--- a/usr/src/sys/kern/kern_acct.c
+++ b/usr/src/sys/kern/kern_acct.c
@@ -1,38 +1,33 @@
-/*
- * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
+/*-
+ * Copyright (c) 1982, 1986, 1989 The Regents of the University of California.

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

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not 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.
+ * %sccs.include.proprietary.c%

  *
  *

- *     @(#)kern_acct.c 7.5 (Berkeley) %G%
+ *     @(#)kern_acct.c 7.26 (Berkeley) %G%

  */
 
  */
 

-#include "param.h"
-#include "systm.h"
-#include "user.h"
-#include "vnode.h"
-#include "mount.h"
-#include "kernel.h"
-#include "acct.h"
-#include "uio.h"
-#include "syslog.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/namei.h>
+#include <sys/resourcevar.h>
+#include <sys/proc.h>
+#include <sys/ioctl.h>
+#include <sys/termios.h>
+#include <sys/tty.h>
+#include <sys/vnode.h>
+#include <sys/mount.h>
+#include <sys/kernel.h>
+#include <sys/file.h>
+#include <sys/acct.h>
+#include <sys/syslog.h>

 
 /*
  * Values associated with enabling and disabling accounting
  */
 int    acctsuspend = 2;        /* stop accounting when < 2% free space left */
 int    acctresume = 4;         /* resume when free space risen to > 4% */
 
 /*
  * Values associated with enabling and disabling accounting
  */
 int    acctsuspend = 2;        /* stop accounting when < 2% free space left */
 int    acctresume = 4;         /* resume when free space risen to > 4% */

-struct timeval chk = { 15, 0 };/* frequency to check space for accounting */
+int    chk = 15;               /* frequency (in seconds) to check space */

 
 /*
  * SHOULD REPLACE THIS WITH A DRIVER THAT CAN BE READ TO SIMPLIFY.
 
 /*
  * SHOULD REPLACE THIS WITH A DRIVER THAT CAN BE READ TO SIMPLIFY.


@@ -41,66 +36,75 @@ struct      vnode *acctp;
 struct vnode *savacctp;
 
 /*
 struct vnode *savacctp;
 
 /*

- * Perform process accounting functions.
+ * Enable or disable process accounting.
+ *
+ * If a non-null filename is given, that file is used to store accounting
+ * records on process exit. If a null filename is given process accounting
+ * is suspended. If accounting is enabled, the system checks the amount
+ * of freespace on the filesystem at timeval intervals. If the amount of
+ * freespace is below acctsuspend percent, accounting is suspended. If
+ * accounting has been suspended, and freespace rises above acctresume,
+ * accounting is resumed.

  */
  */

-sysacct()
+/* ARGSUSED */
+struct sysacct_args {
+       char    *fname;
+};
+sysacct(p, uap, retval)
+       struct proc *p;
+       struct sysacct_args *uap;
+       int *retval;

 {
        register struct vnode *vp;
 {
        register struct vnode *vp;

-       register struct a {
-               char    *fname;
-       } *uap = (struct a *)u.u_ap;
-       register struct nameidata *ndp = &u.u_nd;
-       extern int acctwatch();
+       extern void acctwatch __P((void *));

        struct vnode *oacctp;
        struct vnode *oacctp;

+       int error;
+       struct nameidata nd;

 
 

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

        if (savacctp) {
                acctp = savacctp;
                savacctp = NULL;
        }
        if (savacctp) {
                acctp = savacctp;
                savacctp = NULL;
        }

-       if (uap->fname==NULL) {
+       if (uap->fname == NULL) {

                if (vp = acctp) {
                        acctp = NULL;
                if (vp = acctp) {
                        acctp = NULL;

-                       vrele(vp);
-                       untimeout(acctwatch, (caddr_t)&chk);
+                       error = vn_close(vp, FWRITE, p->p_ucred, p);
+                       untimeout(acctwatch, NULL);

                }
                }

-               return;
+               return (error);

        }
        }

-       ndp->ni_nameiop = LOOKUP | FOLLOW;
-       ndp->ni_segflg = UIO_USERSPACE;
-       ndp->ni_dirp = uap->fname;
-       if (u.u_error = namei(ndp))
-               return;
-       vp = ndp->ni_vp;
+       NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->fname, p);
+       if (error = vn_open(&nd, FWRITE, 0644))
+               return (error);
+       vp = nd.ni_vp;
+       VOP_UNLOCK(vp);

        if (vp->v_type != VREG) {
        if (vp->v_type != VREG) {

-               u.u_error = EACCES;
-               vrele(vp);
-               return;
-       }
-       if (vp->v_mount->m_flag & M_RDONLY) {
-               u.u_error = EROFS;
-               vrele(vp);
-               return;
+               (void) vn_close(vp, FWRITE, p->p_ucred, p);
+               return (EACCES);

        }
        oacctp = acctp;
        acctp = vp;
        if (oacctp)
        }
        oacctp = acctp;
        acctp = vp;
        if (oacctp)

-               vrele(oacctp);
-       acctwatch(&chk);
+               error = vn_close(oacctp, FWRITE, p->p_ucred, p);
+       acctwatch(NULL);
+       return (error);

 }
 
 /*
  * Periodically check the file system to see if accounting
  * should be turned on or off.
  */
 }
 
 /*
  * Periodically check the file system to see if accounting
  * should be turned on or off.
  */

-acctwatch(resettime)
-       struct timeval *resettime;
+/* ARGSUSED */
+void
+acctwatch(a)
+       void *a;

 {
        struct statfs sb;
 
        if (savacctp) {
 {
        struct statfs sb;
 
        if (savacctp) {

-               (void)VFS_STATFS(savacctp->v_mount, &sb);
+               (void)VFS_STATFS(savacctp->v_mount, &sb, (struct proc *)0);

                if (sb.f_bavail > acctresume * sb.f_blocks / 100) {
                        acctp = savacctp;
                        savacctp = NULL;
                if (sb.f_bavail > acctresume * sb.f_blocks / 100) {
                        acctp = savacctp;
                        savacctp = NULL;


@@ -110,54 +114,59 @@ acctwatch(resettime)
        }
        if (acctp == NULL)
                return;
        }
        if (acctp == NULL)
                return;

-       (void)VFS_STATFS(acctp->v_mount, &sb);
+       (void)VFS_STATFS(acctp->v_mount, &sb, (struct proc *)0);

        if (sb.f_bavail <= acctsuspend * sb.f_blocks / 100) {
                savacctp = acctp;
                acctp = NULL;
                log(LOG_NOTICE, "Accounting suspended\n");
        }
        if (sb.f_bavail <= acctsuspend * sb.f_blocks / 100) {
                savacctp = acctp;
                acctp = NULL;
                log(LOG_NOTICE, "Accounting suspended\n");
        }

-       timeout(acctwatch, (caddr_t)resettime, hzto(resettime));
+       timeout(acctwatch, NULL, chk * hz);

 }
 
 /*
 }
 
 /*

- * On exit, write a record on the accounting file.
+ * This routine calculates an accounting record for a process and,
+ * if accounting is enabled, writes it to the accounting file.

  */
  */

-acct()
+acct(p)
+       register struct proc *p;

 {
        register struct rusage *ru;
        struct vnode *vp;
 {
        register struct rusage *ru;
        struct vnode *vp;

-       struct timeval t;
-       int i;
+       struct timeval t, ut, st;
+       int i, s;

        struct acct acctbuf;
        register struct acct *ap = &acctbuf;
 
        if ((vp = acctp) == NULL)
        struct acct acctbuf;
        register struct acct *ap = &acctbuf;
 
        if ((vp = acctp) == NULL)

-               return;
-       bcopy(u.u_comm, ap->ac_comm, sizeof(ap->ac_comm));
-       ru = &u.u_ru;
-       ap->ac_utime = compress(ru->ru_utime.tv_sec, ru->ru_utime.tv_usec);
-       ap->ac_stime = compress(ru->ru_stime.tv_sec, ru->ru_stime.tv_usec);
+               return (0);
+       bcopy(p->p_comm, ap->ac_comm, sizeof(ap->ac_comm));
+       ru = &p->p_stats->p_ru;
+       calcru(p, &ut, &st, NULL);
+       s = splclock();

        t = time;
        t = time;

-       timevalsub(&t, &u.u_start);
+       splx(s);
+       ap->ac_utime = compress(ut.tv_sec, ut.tv_usec);
+       ap->ac_stime = compress(st.tv_sec, st.tv_usec);
+       timevalsub(&t, &p->p_stats->p_start);

        ap->ac_etime = compress(t.tv_sec, t.tv_usec);
        ap->ac_etime = compress(t.tv_sec, t.tv_usec);

-       ap->ac_btime = u.u_start.tv_sec;
-       ap->ac_uid = u.u_ruid;
-       ap->ac_gid = u.u_rgid;
-       t = ru->ru_stime;
-       timevaladd(&t, &ru->ru_utime);
+       ap->ac_btime = p->p_stats->p_start.tv_sec;
+       ap->ac_uid = p->p_cred->p_ruid;
+       ap->ac_gid = p->p_cred->p_rgid;
+       t = st;
+       timevaladd(&t, &ut);

        if (i = t.tv_sec * hz + t.tv_usec / tick)
        if (i = t.tv_sec * hz + t.tv_usec / tick)

-               ap->ac_mem = (ru->ru_ixrss+ru->ru_idrss+ru->ru_isrss) / i;
+               ap->ac_mem = (ru->ru_ixrss + ru->ru_idrss + ru->ru_isrss) / i;

        else
                ap->ac_mem = 0;
        else
                ap->ac_mem = 0;

-       ap->ac_mem >>= CLSIZELOG2;

        ap->ac_io = compress(ru->ru_inblock + ru->ru_oublock, (long)0);
        ap->ac_io = compress(ru->ru_inblock + ru->ru_oublock, (long)0);

-       if (u.u_ttyp)
-               ap->ac_tty = u.u_ttyd;
+       if (p->p_flag&SCTTY && p->p_session->s_ttyp)
+               ap->ac_tty = p->p_session->s_ttyp->t_dev;

        else
                ap->ac_tty = NODEV;
        else
                ap->ac_tty = NODEV;

-       ap->ac_flag = u.u_acflag;
-       u.u_error = vn_rdwr(UIO_WRITE, vp, (caddr_t)ap, sizeof (acctbuf),
-               (off_t)0, UIO_SYSSPACE, IO_UNIT|IO_APPEND, u.u_cred, (int *)0);
+       ap->ac_flag = p->p_acflag;
+       return (vn_rdwr(UIO_WRITE, vp, (caddr_t)ap, sizeof (acctbuf), (off_t)0,
+               UIO_SYSSPACE, IO_UNIT|IO_APPEND, p->p_ucred, (int *)0,
+               (struct proc *)0));

 }
 
 /*
 }
 
 /*