X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/f02cb652a11ae101c9100dceff9d1e780458b009..6b8f7051f2b8ef9bd16f7fb52d3226972bd3aa4f:/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 d326f2a664..235c2e0b54 100644
--- a/usr/src/sys/kern/kern_acct.c
+++ b/usr/src/sys/kern/kern_acct.c
@@ -1,33 +1,38 @@
 /*-
- * Copyright (c) 1982, 1986, 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1986, 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
  *
  * %sccs.include.proprietary.c%
  *
- *	@(#)kern_acct.c	7.24 (Berkeley) %G%
+ *	@(#)kern_acct.c	8.6 (Berkeley) %G%
  */
 
-#include "param.h"
-#include "systm.h"
-#include "namei.h"
-#include "resourcevar.h"
-#include "proc.h"
-#include "ioctl.h"
-#include "termios.h"
-#include "tty.h"
-#include "vnode.h"
-#include "mount.h"
-#include "kernel.h"
-#include "file.h"
-#include "acct.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% */
-int	chk = 15;		/* frequency (in seconds) to check space */
+int	acctchkfreq = 15;	/* frequency (in seconds) to check space */
 
 /*
  * SHOULD REPLACE THIS WITH A DRIVER THAT CAN BE READ TO SIMPLIFY.
@@ -46,12 +51,12 @@ struct	vnode *savacctp;
  * accounting has been suspended, and freespace rises above acctresume,
  * accounting is resumed.
  */
-/* ARGSUSED */
-sysacct(p, uap, retval)
+struct acct_args {
+	char	*fname;
+};
+acct(p, uap, retval)
 	struct proc *p;
-	struct args {
-		char	*fname;
-	} *uap;
+	struct acct_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
@@ -93,7 +98,9 @@ sysacct(p, uap, retval)
 
 /*
  * Periodically check the file system to see if accounting
- * should be turned on or off.
+ * should be turned on or off. Beware the case where the vnode
+ * has been vgone()'d out from underneath us, e.g. when the file
+ * system containing the accounting file has been forcibly unmounted.
  */
 /* ARGSUSED */
 void
@@ -103,47 +110,64 @@ acctwatch(a)
 	struct statfs sb;
 
 	if (savacctp) {
+		if (savacctp->v_type == VBAD) {
+			(void) vn_close(savacctp, FWRITE, NOCRED, NULL);
+			savacctp = NULL;
+			return;
+		}
 		(void)VFS_STATFS(savacctp->v_mount, &sb, (struct proc *)0);
 		if (sb.f_bavail > acctresume * sb.f_blocks / 100) {
 			acctp = savacctp;
 			savacctp = NULL;
 			log(LOG_NOTICE, "Accounting resumed\n");
+		}
+	} else {
+		if (acctp == NULL)
+			return;
+		if (acctp->v_type == VBAD) {
+			(void) vn_close(acctp, FWRITE, NOCRED, NULL);
+			acctp = NULL;
 			return;
 		}
+		(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 (acctp == NULL)
-		return;
-	(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");
-	}
-	timeout(acctwatch, NULL, chk * hz);
+	timeout(acctwatch, NULL, acctchkfreq * hz);
 }
 
 /*
  * This routine calculates an accounting record for a process and,
  * if accounting is enabled, writes it to the accounting file.
  */
-acct(p)
+acct_process(p)
 	register struct proc *p;
 {
 	register struct rusage *ru;
 	struct vnode *vp;
 	struct timeval t, ut, st;
-	int i, s;
+	int error, i, s;
 	struct acct acctbuf;
 	register struct acct *ap = &acctbuf;
 
-	if ((vp = acctp) == NULL)
+	s = splclock();
+	if ((vp = acctp) == NULL) {
+		splx(s);
+		return (0);
+	}
+	if (vp->v_type == VBAD) {
+		(void) vn_close(vp, FWRITE, NOCRED, NULL);
+		acctp = NULL;
+		splx(s);
 		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;
-	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);
@@ -158,14 +182,17 @@ acct(p)
 	else
 		ap->ac_mem = 0;
 	ap->ac_io = compress(ru->ru_inblock + ru->ru_oublock, (long)0);
-	if (p->p_flag&SCTTY && p->p_session->s_ttyp)
+	if (p->p_flag & P_CONTROLT && p->p_session->s_ttyp)
 		ap->ac_tty = p->p_session->s_ttyp->t_dev;
 	else
 		ap->ac_tty = NODEV;
 	ap->ac_flag = p->p_acflag;
-	return (vn_rdwr(UIO_WRITE, vp, (caddr_t)ap, sizeof (acctbuf), (off_t)0,
+	VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);
+	error = 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));
+		(struct proc *)0);
+	splx(s);
+	return (error);
 }
 
 /*