Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make acct_lock a rwlock.

Browse Source
This commit is contained in:
ad 2008-01-05 18:23:30 +00:00
parent 63baaccb6d
commit 21946bba05
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/kern/kern_acct.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_acct.c,v 1.80 2007/12/20 23:03:07 dsl Exp $ */
/* $NetBSD: kern_acct.c,v 1.81 2008/01/05 18:23:30 ad Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_acct.c,v 1.80 2007/12/20 23:03:07 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_acct.c,v 1.81 2008/01/05 18:23:30 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -105,9 +105,9 @@ __KERNEL_RCSID(0, "$NetBSD: kern_acct.c,v 1.80 2007/12/20 23:03:07 dsl Exp $");
*/
/*
* Mutex to serialize system calls and kernel threads.
* Lock to serialize system calls and kernel threads.
*/
kmutex_t acct_lock;
krwlock_t acct_lock;
/*
* The global accounting state and related data. Gain the mutex before
@ -212,6 +212,8 @@ acct_stop(void)
{
int error;
KASSERT(rw_write_held(&acct_lock));
if (acct_vp != NULLVP && acct_vp->v_type != VBAD) {
error = vn_close(acct_vp, FWRITE, acct_cred, NULL);
#ifdef DIAGNOSTIC
@ -240,7 +242,7 @@ acctwatch(void *arg)
int error;
log(LOG_NOTICE, "Accounting started\n");
mutex_enter(&acct_lock);
rw_enter(&acct_lock, RW_WRITER);
while (acct_state != ACCT_STOP) {
if (acct_vp->v_type == VBAD) {
log(LOG_NOTICE, "Accounting terminated\n");
@ -254,14 +256,16 @@ acctwatch(void *arg)
printf("acctwatch: failed to statvfs, error = %d\n",
error);
#endif
error = kpause("actwat", false, acctchkfreq * hz, &acct_lock);
rw_exit(&acct_lock);
error = kpause("actwat", false, acctchkfreq * hz, NULL);
rw_enter(&acct_lock, RW_WRITER);
#ifdef DIAGNOSTIC
if (error != 0 && error != EWOULDBLOCK)
printf("acctwatch: sleep error %d\n", error);
#endif
}
acct_dkwatcher = NULL;
mutex_exit(&acct_lock);
rw_exit(&acct_lock);
kthread_exit(0);
}
@ -273,7 +277,7 @@ acct_init(void)
acct_state = ACCT_STOP;
acct_vp = NULLVP;
acct_cred = NULL;
mutex_init(&acct_lock, MUTEX_DEFAULT, IPL_NONE);
rw_init(&acct_lock);
}
/*
@ -333,7 +337,7 @@ sys_acct(struct lwp *l, const struct sys_acct_args *uap, register_t *retval)
VOP_UNLOCK(nd.ni_vp, 0);
}
mutex_enter(&acct_lock);
rw_enter(&acct_lock, RW_WRITER);
/*
* If accounting was previously enabled, kill the old space-watcher,
@ -367,7 +371,7 @@ sys_acct(struct lwp *l, const struct sys_acct_args *uap, register_t *retval)
}
out:
mutex_exit(&acct_lock);
rw_exit(&acct_lock);
return (error);
bad:
vn_close(nd.ni_vp, FWRITE, l->l_cred, l);
@ -393,7 +397,7 @@ acct_process(struct lwp *l)
if (acct_state != ACCT_ACTIVE)
return 0;
mutex_enter(&acct_lock);
rw_enter(&acct_lock, RW_READER);
/* If accounting isn't enabled, don't bother */
if (acct_state != ACCT_ACTIVE)
@ -472,6 +476,6 @@ acct_process(struct lwp *l)
p->p_rlimit[RLIMIT_FSIZE] = orlim;
out:
mutex_exit(&acct_lock);
rw_exit(&acct_lock);
return (error);
}