svn commit: r222380 - in head: sys/kern sys/sys usr.bin/rctl

[Edward Tomasz Napierala]

Author: trasz
Date: Fri May 27 19:57:58 2011
New Revision: 222380
URL: http://svn.freebsd.org/changeset/base/222380

Log:
  Remove definitions for RACCT_FSIZE and RACCT_SBSIZE - these two are rather
  performance-sensitive and not that useful, so I won't be merging them
  before 9.0.

Modified:
  head/sys/kern/kern_racct.c
  head/sys/kern/kern_rctl.c
  head/sys/sys/racct.h
  head/usr.bin/rctl/rctl.8

Modified: head/sys/kern/kern_racct.c
==============================================================================
--- head/sys/kern/kern_racct.c	Fri May 27 19:36:07 2011	(r222379)
+++ head/sys/kern/kern_racct.c	Fri May 27 19:57:58 2011	(r222380)
@@ -104,8 +104,6 @@ SDT_PROBE_DEFINE2(racct, kernel, 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);

Modified: head/sys/kern/kern_rctl.c
==============================================================================
--- head/sys/kern/kern_rctl.c	Fri May 27 19:36:07 2011	(r222379)
+++ head/sys/kern/kern_rctl.c	Fri May 27 19:57:58 2011	(r222380)
@@ -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 },

Modified: head/sys/sys/racct.h
==============================================================================
--- head/sys/sys/racct.h	Fri May 27 19:36:07 2011	(r222379)
+++ head/sys/sys/racct.h	Fri May 27 19:57:58 2011	(r222380)
@@ -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
 
 /*

Modified: head/usr.bin/rctl/rctl.8
==============================================================================
--- head/usr.bin/rctl/rctl.8	Fri May 27 19:36:07 2011	(r222379)
+++ head/usr.bin/rctl/rctl.8	Fri May 27 19:57:58 2011	(r222380)
@@ -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 
 .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 
 .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