update with merged versions
This commit is contained in:
cgd
parent
47d5757075
commit
b3fda1e8ec
@ -1,4 +1,5 @@
|
||||
/*-
|
||||
* Copyright (c) 1994 Christopher G. Demetriou
|
||||
* Copyright (c) 1982, 1986, 1989, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
* (c) UNIX System Laboratories, Inc.
|
||||
@ -36,6 +37,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)kern_acct.c 8.1 (Berkeley) 6/14/93
|
||||
* $Id: kern_acct.c,v 1.24 1994/05/20 10:05:02 cgd Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -45,36 +47,38 @@
|
||||
#include <sys/file.h>
|
||||
#include <sys/syslog.h>
|
||||
#include <sys/kernel.h>
|
||||
|
||||
struct acct_args {
|
||||
char *fname;
|
||||
};
|
||||
acct(a1, a2, a3)
|
||||
struct proc *a1;
|
||||
struct acct_args *a2;
|
||||
int *a3;
|
||||
{
|
||||
/*
|
||||
* Body deleted.
|
||||
*/
|
||||
return (ENOSYS);
|
||||
}
|
||||
|
||||
acct_process(a1)
|
||||
struct proc *a1;
|
||||
{
|
||||
|
||||
/*
|
||||
* Body deleted.
|
||||
*/
|
||||
return;
|
||||
}
|
||||
#include <sys/namei.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/acct.h>
|
||||
#include <sys/resourcevar.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/tty.h>
|
||||
|
||||
/*
|
||||
* Periodically check the file system to see if accounting
|
||||
* should be turned on or off.
|
||||
* The routines implemented in this file are described in:
|
||||
* Leffler, et al.: The Design and Implementation of the 4.3BSD
|
||||
* UNIX Operating System (Addison Welley, 1989)
|
||||
* on pages 62-63.
|
||||
*
|
||||
* Arguably, to simplify accounting operations, this mechanism should
|
||||
* be replaced by one in which an accounting log file (similar to /dev/klog)
|
||||
* is read by a user process, etc. However, that has its own problems.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Internal accounting functions.
|
||||
* The former's operation is described in Leffler, et al., and the latter
|
||||
* was provided by UCB with the 4.4BSD-Lite release
|
||||
*/
|
||||
comp_t encode_comp_t __P((u_long, u_long));
|
||||
void acctwatch __P((void *));
|
||||
|
||||
/*
|
||||
* Accounting vnode pointer, and saved vnode pointer.
|
||||
*/
|
||||
struct vnode *acctp;
|
||||
struct vnode *savacctp;
|
||||
|
||||
/*
|
||||
* Values associated with enabling and disabling accounting
|
||||
*/
|
||||
@ -83,11 +87,179 @@ int acctresume = 4; /* resume when free space risen to > 4% */
|
||||
int acctchkfreq = 15; /* frequency (in seconds) to check space */
|
||||
|
||||
/*
|
||||
* SHOULD REPLACE THIS WITH A DRIVER THAT CAN BE READ TO SIMPLIFY.
|
||||
* Accounting system call. Written based on the specification and
|
||||
* previous implementation done by Mark Tinguely.
|
||||
*/
|
||||
struct vnode *acctp;
|
||||
struct vnode *savacctp;
|
||||
struct acct_args {
|
||||
char *fname;
|
||||
};
|
||||
acct(p, uap, retval)
|
||||
struct proc *p;
|
||||
struct acct_args *uap;
|
||||
int *retval;
|
||||
{
|
||||
struct nameidata nd;
|
||||
int error;
|
||||
|
||||
/* Make sure that the caller is root. */
|
||||
if (error = suser(p->p_ucred, &p->p_acflag))
|
||||
return (error);
|
||||
|
||||
/*
|
||||
* If accounting is to be started to a file, open that file for
|
||||
* writing and make sure it's a 'normal'.
|
||||
*/
|
||||
if (uap->fname != NULL) {
|
||||
nd.ni_segflg = UIO_USERSPACE;
|
||||
nd.ni_dirp = uap->fname;
|
||||
if (error = vn_open(&nd, p, FWRITE, 0))
|
||||
return (error);
|
||||
VOP_UNLOCK(nd.ni_vp);
|
||||
|
||||
if (nd.ni_vp->v_type != VREG) {
|
||||
vn_close(nd.ni_vp, FWRITE, p->p_ucred, p);
|
||||
return (EACCES);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* If accounting was previously enabled, kill the old space-watcher,
|
||||
* close the file, and (if no new file was specified, leave).
|
||||
*/
|
||||
if (acctp != NULLVP || savacctp != NULLVP) {
|
||||
untimeout(acctwatch, NULL);
|
||||
error = vn_close((acctp != NULLVP ? acctp : savacctp), FWRITE,
|
||||
p->p_ucred, p);
|
||||
acctp = savacctp = NULLVP;
|
||||
if (uap->fname == NULL)
|
||||
return (error);
|
||||
}
|
||||
|
||||
/*
|
||||
* Save the new accounting file vnode, and schedule the new
|
||||
* free space watcher.
|
||||
*/
|
||||
acctp = nd.ni_vp;
|
||||
acctwatch(NULL);
|
||||
return (error);
|
||||
}
|
||||
|
||||
/*
|
||||
* Write out process accounting information, on process exit.
|
||||
* Data to be written out is specified in Leffler, et al.
|
||||
* and are enumerated below. (They're also noted in the system
|
||||
* "acct.h" header file.)
|
||||
*/
|
||||
acct_process(p)
|
||||
struct proc *p;
|
||||
{
|
||||
struct acct acct;
|
||||
struct rusage *r;
|
||||
struct timeval ut, st, tmp;
|
||||
int s, t;
|
||||
|
||||
/* If accounting isn't enabled, don't bother */
|
||||
if (acctp == NULLVP)
|
||||
return (0);
|
||||
|
||||
/*
|
||||
* Get process accounting information.
|
||||
*/
|
||||
|
||||
/* (1) The name of the command that ran */
|
||||
bcopy(p->p_comm, acct.ac_comm, sizeof acct.ac_comm);
|
||||
|
||||
/* (2) The amount of user and system time that was used */
|
||||
calcru(p, &ut, &st, NULL);
|
||||
acct.ac_utime = encode_comp_t(ut.tv_sec, ut.tv_usec);
|
||||
acct.ac_stime = encode_comp_t(st.tv_sec, st.tv_usec);
|
||||
|
||||
/* (3) The elapsed time the commmand ran (and its starting time) */
|
||||
acct.ac_btime = p->p_stats->p_start.tv_sec;
|
||||
s = splclock();
|
||||
tmp = time;
|
||||
splx(s);
|
||||
timevalsub(&tmp, &p->p_stats->p_start);
|
||||
acct.ac_etime = encode_comp_t(tmp.tv_sec, tmp.tv_usec);
|
||||
|
||||
/* (4) The average amount of memory used */
|
||||
r = &p->p_stats->p_ru;
|
||||
tmp = ut;
|
||||
timevaladd(&tmp, &st);
|
||||
t = tmp.tv_sec * hz + tmp.tv_usec / tick;
|
||||
if (t)
|
||||
acct.ac_mem = (r->ru_ixrss + r->ru_idrss + r->ru_isrss) / t;
|
||||
else
|
||||
acct.ac_mem = 0;
|
||||
|
||||
/* (5) The number of disk I/O
|
||||
acct.ac_io = encode_comp_t(r->ru_inblock + r->ru_oublock, 0);
|
||||
|
||||
/* (6) The UID and GID of the process */
|
||||
acct.ac_uid = p->p_cred->p_ruid;
|
||||
acct.ac_gid = p->p_cred->p_rgid;
|
||||
|
||||
/* (7) The terminal from which the process was started */
|
||||
if ((p->p_flag & P_CONTROLT) && p->p_pgrp->pg_session->s_ttyp)
|
||||
acct.ac_tty = p->p_pgrp->pg_session->s_ttyp->t_dev;
|
||||
else
|
||||
acct.ac_tty = NODEV;
|
||||
|
||||
/* (8) The boolean flags that tell how the process terminated, etc. */
|
||||
acct.ac_flag = p->p_acflag;
|
||||
|
||||
/*
|
||||
* Now, just write the accounting information to the file.
|
||||
*/
|
||||
LEASE_CHECK(vp, p, p->p_ucred, LEASE_WRITE);
|
||||
return (vn_rdwr(UIO_WRITE, acctp, (caddr_t)&acct, sizeof (acct),
|
||||
(off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, p->p_ucred,
|
||||
(int *)0, p));
|
||||
}
|
||||
|
||||
/*
|
||||
* Encode_comp_t converts from ticks in seconds and microseconds
|
||||
* to ticks in 1/AHZ seconds. The encoding is described in
|
||||
* Leffler, et al., on page 63.
|
||||
*/
|
||||
|
||||
#define MANTSIZE 13 /* 13 bit mantissa. */
|
||||
#define EXPSIZE 3 /* Base 8 (3 bit) exponent. */
|
||||
#define MAXFRACT ((1 << MANTSIZE) - 1) /* Maximum fractional value. */
|
||||
|
||||
comp_t
|
||||
encode_comp_t(s, us)
|
||||
u_long s, us;
|
||||
{
|
||||
int exp, rnd;
|
||||
|
||||
exp = 0;
|
||||
rnd = 0;
|
||||
s *= AHZ;
|
||||
s += us / (1000000 / AHZ); /* Maximize precision. */
|
||||
|
||||
while (s > MAXFRACT) {
|
||||
rnd = s & (1 << (EXPSIZE - 1)); /* Round up? */
|
||||
s >>= EXPSIZE; /* Base 8 exponent == 3 bit shift. */
|
||||
exp++;
|
||||
}
|
||||
|
||||
/* If we need to round up, do it (and handle overflow correctly). */
|
||||
if (rnd && (++s > MAXFRACT)) {
|
||||
s >>= EXPSIZE;
|
||||
exp++;
|
||||
}
|
||||
|
||||
/* Clean it up and polish it off. */
|
||||
exp <<= MANTSIZE; /* Shift the exponent into place */
|
||||
exp += s; /* and add on the mantissa. */
|
||||
return (exp);
|
||||
}
|
||||
|
||||
/*
|
||||
* Periodically check the file system to see if accounting
|
||||
* should be turned on or off.
|
||||
*/
|
||||
/* ARGSUSED */
|
||||
void
|
||||
acctwatch(a)
|
||||
|
||||
@ -1 +1 @@
|
||||
revision 1.14 intentionally removed
|
||||
revision 1.15 intentionally removed
|
||||
|
||||
Loading…
Reference in New Issue
Block a user