socsvn commit: r236191 - in soc2012/rudot: aux sys/kern sys/sys

[rudot at FreeBSD.org]

Author: rudot
Date: Wed May 23 10:24:06 2012
New Revision: 236191
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=236191

Log:
  added pcpu resource to rctl

Modified:
  soc2012/rudot/aux/add.sh
  soc2012/rudot/aux/notes.txt
  soc2012/rudot/sys/kern/kern_rctl.c
  soc2012/rudot/sys/sys/racct.h

Modified: soc2012/rudot/aux/add.sh
==============================================================================
--- soc2012/rudot/aux/add.sh	Wed May 23 09:38:37 2012	(r236190)
+++ soc2012/rudot/aux/add.sh	Wed May 23 10:24:06 2012	(r236191)
@@ -5,4 +5,4 @@
 
 PID=$1
 
-rctl -a process:${PID}:cpup:limit=50
+rctl -a process:${PID}:pcpu:deny=50

Modified: soc2012/rudot/aux/notes.txt
==============================================================================
--- soc2012/rudot/aux/notes.txt	Wed May 23 09:38:37 2012	(r236190)
+++ soc2012/rudot/aux/notes.txt	Wed May 23 10:24:06 2012	(r236191)
@@ -1,7 +1 @@
-rctl -a process:PID:cpup:limit=50
-
-sys_rctl_add_rule -> rctl_string_to_rule
-line: 907 " error = str2value(resourcestr, &rule->rr_resource,"
-	  "		resourcenames);"
-
-error has value 22
+rctl -a process:PID:pcpu:deny=50 works

Modified: soc2012/rudot/sys/kern/kern_rctl.c
==============================================================================
--- soc2012/rudot/sys/kern/kern_rctl.c	Wed May 23 09:38:37 2012	(r236190)
+++ soc2012/rudot/sys/kern/kern_rctl.c	Wed May 23 10:24:06 2012	(r236191)
@@ -120,6 +120,7 @@
 	{ "nshm", RACCT_NSHM },
 	{ "shmsize", RACCT_SHMSIZE },
 	{ "wallclock", RACCT_WALLCLOCK },
+	{ "pcpu", RACCT_PCTCPU },
 	{ NULL, -1 }};
 
 static struct dict actionnames[] = {

Modified: soc2012/rudot/sys/sys/racct.h
==============================================================================
--- soc2012/rudot/sys/sys/racct.h	Wed May 23 09:38:37 2012	(r236190)
+++ soc2012/rudot/sys/sys/racct.h	Wed May 23 10:24:06 2012	(r236191)
@@ -68,7 +68,8 @@
 #define	RACCT_NSHM		17
 #define	RACCT_SHMSIZE		18
 #define	RACCT_WALLCLOCK		19
-#define	RACCT_MAX		RACCT_WALLCLOCK
+#define RACCT_PCTCPU		20
+#define	RACCT_MAX		RACCT_PCTCPU
 
 /*
  * Resource properties.