diff options
| author | trasz <trasz@FreeBSD.org> | 2011-03-31 19:22:11 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2011-03-31 19:22:11 +0000 |
| commit | 4c83b1bba4b449bdd0b62585ba1ebe3163ef107c (patch) | |
| tree | 4d811cbdd5ef5640877c96685d01fe33cad06e1e /sys/kern/kern_fork.c | |
| parent | 596c078ed8b0a61497f5b46a4d05593182e0f69d (diff) | |
| download | FreeBSD-src-4c83b1bba4b449bdd0b62585ba1ebe3163ef107c.zip FreeBSD-src-4c83b1bba4b449bdd0b62585ba1ebe3163ef107c.tar.gz | |
Enable accounting for RACCT_NPROC and RACCT_NTHR.
Sponsored by: The FreeBSD Foundation
Reviewed by: kib (earlier version)
Diffstat (limited to 'sys/kern/kern_fork.c')
| -rw-r--r-- | sys/kern/kern_fork.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 1dcc5bb..04e635a 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -734,6 +734,12 @@ fork1(struct thread *td, int flags, int pages, struct proc **procp) return (fork_norfproc(td, flags)); } + PROC_LOCK(p1); + error = racct_add(p1, RACCT_NPROC, 1); + PROC_UNLOCK(p1); + if (error != 0) + return (EAGAIN); + mem_charged = 0; vm2 = NULL; if (pages == 0) @@ -817,6 +823,17 @@ fork1(struct thread *td, int flags, int pages, struct proc **procp) } /* + * After fork, there is exactly one thread running. + */ + PROC_LOCK(newproc); + error = racct_set(newproc, RACCT_NTHR, 1); + PROC_UNLOCK(newproc); + if (error != 0) { + error = EAGAIN; + goto fail; + } + + /* * Increment the count of procs running with this uid. Don't allow * a nonprivileged user to exceed their current limit. * @@ -857,6 +874,9 @@ fail1: vmspace_free(vm2); uma_zfree(proc_zone, newproc); pause("fork", hz / 2); + PROC_LOCK(p1); + racct_sub(p1, RACCT_NPROC, 1); + PROC_UNLOCK(p1); return (error); } |
