SOURCES: util-vserver-cpuset.patch - added cpusete virtualization

[baggins]

Author: baggins                      Date: Fri Nov 25 16:32:18 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- added cpusete virtualization

---- Files affected:
SOURCES:
   util-vserver-cpuset.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/util-vserver-cpuset.patch
diff -u SOURCES/util-vserver-cpuset.patch:1.6 SOURCES/util-vserver-cpuset.patch:1.7
--- SOURCES/util-vserver-cpuset.patch:1.6	Fri Nov 25 17:11:51 2005
+++ SOURCES/util-vserver-cpuset.patch	Fri Nov 25 17:32:12 2005
@@ -1,23 +1,24 @@
 diff -ur util-vserver-0.30.209/scripts/vserver-setup.functions util-vserver-0.30.209.cpuset/scripts/vserver-setup.functions
 --- util-vserver-0.30.209/scripts/vserver-setup.functions	2005-02-26 00:32:02.000000000 +0100
 +++ util-vserver-0.30.209.cpuset/scripts/vserver-setup.functions	2005-11-25 15:11:30.224131360 +0100
-@@ -24,11 +24,14 @@
+@@ -24,11 +24,15 @@
  SETUP_CONFDIR=
  SETUP_CONTEXT=
  SETUP_INITSTYLE=
 +SETUP_CPUSET=
 +SETUP_CPUSETCPUS=
 +SETUP_CPUSETMEMS=
++SETUP_CPUSETVIRT=
  
  declare -a SETUP_INTERFACES=()
  declare -a SETUP_FLAGS=()
  
 -declare -r SETUP_OPTIONS="confdir:,lockfile:,hostname:,netdev:,netmask:,netprefix:,netbcast:,interface:,flags:,context:,initstyle:"
-+declare -r SETUP_OPTIONS="confdir:,lockfile:,hostname:,netdev:,netmask:,netprefix:,netbcast:,interface:,flags:,context:,initstyle:,cpuset:,cpusetcpus:,cpusetmems:"
++declare -r SETUP_OPTIONS="confdir:,lockfile:,hostname:,netdev:,netmask:,netprefix:,netbcast:,interface:,flags:,context:,initstyle:,cpuset:,cpusetcpus:,cpusetmems:,cpusetvirt"
  declare -r SETUP_HELPMSG=$"
      --context   ...  the static context of the vserver [default: none; a dynamic
                       context will be assumed]
-@@ -55,6 +58,16 @@
+@@ -55,6 +58,18 @@
  			    this becomes a per vserver limit)
  		     private: No other process can join this security context.
  		            Even root
@@ -31,10 +32,12 @@
 +		...  sets which memory pools belong to the CPUSET,
 +		     exclusive is a flag (0|1) prohibiting any other cpuset from
 +		     using those memory pools
++    --cpusetvirt
++		...  virtualize cpuset (guest will see only CPUs defined in cpuset)
      --initstyle <style>
                  ...  configures the initstyle (e.g. minit,sysv,plain)
  "
-@@ -72,6 +85,21 @@
+@@ -72,6 +85,22 @@
  	(--netbcast)	SETUP_NETBCAST=$2;;
  	(--interface)	SETUP_INTERFACES=( "${SETUP_INTERFACES[@]}" "$2" );;
  	(--initstyle)   SETUP_INITSTYLE=$2;;
@@ -53,6 +56,7 @@
 +			SETUP_CPUSETMEMSEXCL=$2
 +			IFS=$old_IFS
 +			;;
++	(--cpusetvirt)  SETUP_CPUSETVIRT=1;;
  	(--flags)	old_IFS=$IFS
  			IFS=,
  			set -- $2
@@ -65,7 +69,7 @@
  
      _setup_writeSingleOption "$name"            "$cfgdir"/name
      _setup_writeSingleOption "$SETUP_CONTEXT"   "$cfgdir"/context
-@@ -150,6 +176,11 @@
+@@ -150,6 +176,12 @@
      _setup_writeSingleOption "$SETUP_NETPREFIX" "$cfgdir"/interfaces/prefix
      _setup_writeSingleOption "$SETUP_NETBCAST"  "$cfgdir"/interfaces/bcast
      _setup_writeSingleOption "$SETUP_INITSTYLE" "$cfgdir"/apps/init/style
@@ -74,13 +78,14 @@
 +    _setup_writeSingleOption "$SETUP_CPUSETCPUSEXCL" "$cfgdir"/cpuset/cpus_exclusive
 +    _setup_writeSingleOption "$SETUP_CPUSETMEMS"     "$cfgdir"/cpuset/mems
 +    _setup_writeSingleOption "$SETUP_CPUSETMEMSEXCL" "$cfgdir"/cpuset/mem_exclusive
++    _setup_writeSingleOption "$SETUP_CPUSETVIRT"     "$cfgdir"/cpuset/virtualized
  
      local idx=0
      for i in "${SETUP_INTERFACES[@]}"; do
 diff -ur util-vserver-0.30.209/scripts/vserver.functions util-vserver-0.30.209.cpuset/scripts/vserver.functions
 --- util-vserver-0.30.209/scripts/vserver.functions	2005-11-25 14:30:27.665999880 +0100
 +++ util-vserver-0.30.209.cpuset/scripts/vserver.functions	2005-11-25 15:11:04.593027880 +0100
-@@ -687,6 +687,53 @@
+@@ -687,6 +687,54 @@
      fi
  }
  
@@ -98,12 +103,13 @@
 +    read cpuset < "$f"/name
 +    test -e "$f"/nocreate || {
 +	test -d /dev/cpuset/"$cpuset" || mkdir /dev/cpuset/"$cpuset" || configured=1
-+	for i in cpus mems cpu_exclusive mem_exclusive; do
++	for i in cpus mems cpu_exclusive mem_exclusive virtualized; do
 +	    if test -e "$f"/"$i"; then
 +		cat "$f"/"$i" >/dev/cpuset/"$cpuset"/"$i" 2>/dev/null || {
 +		    configured=1
 +		    break
 +		}
++	    fi
 +	done
 +    }
 +
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/util-vserver-cpuset.patch?r1=1.6&r2=1.7&f=u