d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove definitions for RACCT_FSIZE and RACCT_SBSIZE - these two are rather

Browse Source 
performance-sensitive and not that useful, so I won't be merging them
before 9.0.
This commit is contained in:
Edward Tomasz Napierala 2011-05-27 19:57:58 +00:00
parent 4daae0cde6
commit 7e2548ae0a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=222380
4 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/kern/kern_racct.c
View File

@ -104,8 +104,6 @@ SDT_PROBE_DEFINE2(racct, kernel, racct, leave, leave, "struct racct *",
int racct_types[] = {
[RACCT_CPU] =
RACCT_IN_THOUSANDS,
[RACCT_FSIZE] =
RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE,
[RACCT_DATA] =
RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE,
[RACCT_STACK] =
@ -120,8 +118,6 @@ int racct_types[] = {
RACCT_RECLAIMABLE | RACCT_DENIABLE,
[RACCT_NOFILE] =
RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE,
[RACCT_SBSIZE] =
RACCT_RECLAIMABLE | RACCT_DENIABLE | RACCT_SLOPPY,
[RACCT_VMEM] =
RACCT_RECLAIMABLE | RACCT_INHERITABLE | RACCT_DENIABLE,
[RACCT_NPTS] =
@ -627,7 +623,6 @@ racct_proc_exit(struct proc *p)
/*
* XXX: Free this some other way.
*/
racct_set(p, RACCT_FSIZE, 0);
racct_set(p, RACCT_NPTS, 0);
racct_set(p, RACCT_NTHR, 0);
racct_set(p, RACCT_RSS, 0);

2
sys/kern/kern_rctl.c
View File

@ -100,7 +100,6 @@ static struct dict subjectnames[] = {
static struct dict resourcenames[] = {
{ "cpu", RACCT_CPU },
{ "fsize", RACCT_FSIZE },
{ "data", RACCT_DATA },
{ "stack", RACCT_STACK },
{ "core", RACCT_CORE },
@ -108,7 +107,6 @@ static struct dict resourcenames[] = {
{ "memlock", RACCT_MEMLOCK },
{ "nproc", RACCT_NPROC },
{ "nofile", RACCT_NOFILE },
{ "sbsize", RACCT_SBSIZE },
{ "vmem", RACCT_VMEM },
{ "npts", RACCT_NPTS },
{ "swap", RACCT_SWAP },

40
sys/sys/racct.h
View File

@ -49,27 +49,25 @@ struct ucred;
*/
#define RACCT_UNDEFINED -1
#define RACCT_CPU 0
#define RACCT_FSIZE 1
#define RACCT_DATA 2
#define RACCT_STACK 3
#define RACCT_CORE 4
#define RACCT_RSS 5
#define RACCT_MEMLOCK 6
#define RACCT_NPROC 7
#define RACCT_NOFILE 8
#define RACCT_SBSIZE 9
#define RACCT_VMEM 10
#define RACCT_NPTS 11
#define RACCT_SWAP 12
#define RACCT_NTHR 13
#define RACCT_MSGQQUEUED 14
#define RACCT_MSGQSIZE 15
#define RACCT_NMSGQ 16
#define RACCT_NSEM 17
#define RACCT_NSEMOP 18
#define RACCT_NSHM 19
#define RACCT_SHMSIZE 20
#define RACCT_WALLCLOCK 21
#define RACCT_DATA 1
#define RACCT_STACK 2
#define RACCT_CORE 3
#define RACCT_RSS 4
#define RACCT_MEMLOCK 5
#define RACCT_NPROC 6
#define RACCT_NOFILE 7
#define RACCT_VMEM 8
#define RACCT_NPTS 9
#define RACCT_SWAP 10
#define RACCT_NTHR 11
#define RACCT_MSGQQUEUED 12
#define RACCT_MSGQSIZE 13
#define RACCT_NMSGQ 14
#define RACCT_NSEM 15
#define RACCT_NSEMOP 16
#define RACCT_NSHM 17
#define RACCT_SHMSIZE 18
#define RACCT_WALLCLOCK 19
#define RACCT_MAX RACCT_WALLCLOCK
/*

4
usr.bin/rctl/rctl.8
View File

@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd May 3, 2011
.Dd May 26, 2011
.Dt RCTL 8
.Os
.Sh NAME
@ -123,7 +123,6 @@ A filter that matches all defined rules for nproc resource would be
.Sh RESOURCES
.Bl -column -offset 3n "msgqqueued"
.It cpu CPU time, in milliseconds
.It fsize maximum file size, in bytes
.It data data size, in bytes
.It stack stack size, in bytes
.It core core dump size, in bytes
@ -131,7 +130,6 @@ A filter that matches all defined rules for nproc resource would be
.It memlock locked memory, in bytes
.It nproc number of processes
.It nofile file descriptor table size
.It sbsize memory consumed by socket buffers, in bytes
.It vmem address space limit, in bytes
.It npts number of PTYs
.It swap swap usage, in bytes