PERFORCE change 186528 for review

[Edward Tomasz Napierala]

http://p4web.freebsd.org/@@186528?ac=10

Change 186528 by trasz at trasz_victim on 2010/12/01 23:50:02

	Minor tweaks.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/TODO#31 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#38 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#97 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/container.h#17 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/TODO#31 (text+ko) ====

@@ -79,6 +79,11 @@
  - We should have a limit for the number of files that were mmapped and then closed,
    and remain mapped in memory.
 
+ - There are several SysV-related global system limits that are not reflected
+   in the containers structure - RUSAGE_SHMMNI, for example. This needs
+   to be investigated; there are many of them and it wouldn't be user-friendly
+   to add ten new resource counters.
+
 HRL-specific issues:
 
  - Bring back per-group limits.

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#38 (text+ko) ====

@@ -104,14 +104,14 @@
 	case RUSAGE_SBSIZE:
 	case RUSAGE_SWAP:
 	case RUSAGE_NTHR:
-	case RUSAGE_WALLCLOCK:
-	case RUSAGE_PCTCPU:
 	case RUSAGE_NMSGQ:
 	case RUSAGE_MSGQQUEUED:
 	case RUSAGE_MSGQSIZE:
 	case RUSAGE_NSEM:
 	case RUSAGE_NSHM:
 	case RUSAGE_SHMSIZE:
+	case RUSAGE_WALLCLOCK:
+	case RUSAGE_PCTCPU:
 		return (0);
 	default:
 		return (1);

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#97 (text+ko) ====

@@ -102,8 +102,6 @@
 	{ "npts", RUSAGE_NPTS },
 	{ "swap", RUSAGE_SWAP },
 	{ "nthr", RUSAGE_NTHR },
-	{ "nvnode", RUSAGE_NVNODE },
-	{ "nsock", RUSAGE_NSOCK },
 	{ "msgqqueued", RUSAGE_MSGQQUEUED },
 	{ "msgqsize", RUSAGE_MSGQSIZE },
 	{ "nmsgq", RUSAGE_NMSGQ },

==== //depot/projects/soc2009/trasz_limits/sys/sys/container.h#17 (text+ko) ====

@@ -67,17 +67,15 @@
 #define	RUSAGE_NPTS		11
 #define	RUSAGE_SWAP		12
 #define	RUSAGE_NTHR		13
-#define	RUSAGE_NVNODE		14
-#define	RUSAGE_NSOCK		15
-#define	RUSAGE_MSGQQUEUED	16
-#define	RUSAGE_MSGQSIZE		17
-#define	RUSAGE_NMSGQ		18
-#define	RUSAGE_NSEM		19
-#define	RUSAGE_NSEMOP		20
-#define	RUSAGE_NSHM		21
-#define	RUSAGE_SHMSIZE		22
-#define	RUSAGE_WALLCLOCK	23
-#define	RUSAGE_PCTCPU		24
+#define	RUSAGE_MSGQQUEUED	14
+#define	RUSAGE_MSGQSIZE		15
+#define	RUSAGE_NMSGQ		16
+#define	RUSAGE_NSEM		17
+#define	RUSAGE_NSEMOP		18
+#define	RUSAGE_NSHM		19
+#define	RUSAGE_SHMSIZE		20
+#define	RUSAGE_WALLCLOCK	21
+#define	RUSAGE_PCTCPU		22
 #define	RUSAGE_MAX		RUSAGE_PCTCPU
 
 /*