[jbosscache-commits] JBoss Cache SVN: r6696 - in benchmarks/benchmark-fwk/trunk: cache-products/jbosscache-1.4.1 and 4 other directories.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2008-09-09 04:14:47 -0400 (Tue, 09 Sep 2008)
New Revision: 6696

Added:
   benchmarks/benchmark-fwk/trunk/jvm_params.sh
   benchmarks/benchmark-fwk/trunk/lib/common/
Modified:
   benchmarks/benchmark-fwk/trunk/bindAddress.sh
   benchmarks/benchmark-fwk/trunk/build.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/config.sh
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/config.sh
   benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/config.sh
   benchmarks/benchmark-fwk/trunk/cache-products/whirlycache-1.0.1/config.sh
   benchmarks/benchmark-fwk/trunk/runNode.sh
Log:
added script to configure the JVM params

Modified: benchmarks/benchmark-fwk/trunk/bindAddress.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/bindAddress.sh	2008-09-09 08:00:08 UTC (rev 6695)
+++ benchmarks/benchmark-fwk/trunk/bindAddress.sh	2008-09-09 08:14:47 UTC (rev 6696)
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 ### Set your bind address for the tests to use. Could be an IP, host name or a reference to an environment variable.
-BIND_ADDRESS=${MYTESTIP_2}
+BIND_ADDRESS=127.0.0.1
 

Modified: benchmarks/benchmark-fwk/trunk/build.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/build.xml	2008-09-09 08:00:08 UTC (rev 6695)
+++ benchmarks/benchmark-fwk/trunk/build.xml	2008-09-09 08:14:47 UTC (rev 6696)
@@ -209,6 +209,7 @@
              nowarn="${compiler.generate.no.warnings}" fork="true">
          <classpath>
             <fileset dir="./cache-products/jbosscache-3.0.0/lib" includes="*.jar"/>
+            <fileset dir="./lib/common" includes="*.jar"/>
             <pathelement location="./lib/commons-logging.jar"/>
             <pathelement location="${framework.output.dir}"/>
          </classpath>

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/config.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/config.sh	2008-09-09 08:00:08 UTC (rev 6695)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/config.sh	2008-09-09 08:14:47 UTC (rev 6696)
@@ -14,5 +14,5 @@
 #--classpath was set
 
 #additional JVM options
-JVM_OPTIONS="$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=true -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.JBossCacheWrapper"
+JVM_OPTIONS="$JVM_OPTIONS -Djava.net.preferIPv4Stack=true -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.JBossCacheWrapper"
 

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/config.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/config.sh	2008-09-09 08:00:08 UTC (rev 6695)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/config.sh	2008-09-09 08:14:47 UTC (rev 6696)
@@ -14,5 +14,5 @@
 #--classpath was set
 
 #additional JVM options
-JVM_OPTIONS="$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=true -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.JBossCache200Wrapper"
+JVM_OPTIONS="$JVM_OPTIONS -Djava.net.preferIPv4Stack=true -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.JBossCache200Wrapper"
 

Modified: benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/config.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/config.sh	2008-09-09 08:00:08 UTC (rev 6695)
+++ benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/config.sh	2008-09-09 08:14:47 UTC (rev 6696)
@@ -9,7 +9,7 @@
 CLASSPATH=$CLASSPATH:./classes/production/terracotta-2.5.0
 
 #other specific JVM options
-JVM_OPTIONS="$JVM_OPTIONS -Xmx1024m -DpreferIPv4Stack=true -Dtc.config=$THIS_DIR/tc-client-config.xml -Dtc.install-root=${TC_HOME}"
+JVM_OPTIONS="$JVM_OPTIONS -DpreferIPv4Stack=true -Dtc.config=$THIS_DIR/tc-client-config.xml -Dtc.install-root=${TC_HOME}"
 JVM_OPTIONS="$JVM_OPTIONS -Xbootclasspath/p:${TC_HOME}/lib/dso-boot/dso-boot-hotspot_linux_150_11.jar"
 JVM_OPTIONS="$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.TerracottaWrapper"
 

Modified: benchmarks/benchmark-fwk/trunk/cache-products/whirlycache-1.0.1/config.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/whirlycache-1.0.1/config.sh	2008-09-09 08:00:08 UTC (rev 6695)
+++ benchmarks/benchmark-fwk/trunk/cache-products/whirlycache-1.0.1/config.sh	2008-09-09 08:14:47 UTC (rev 6696)
@@ -15,4 +15,4 @@
 #--classpath was set
 
 #additional JVM options
-JVM_OPTIONS="$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=true" JVM_OPTIONS="$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.WhirlyCacheWrapper"
+JVM_OPTIONS="$JVM_OPTIONS -Djava.net.preferIPv4Stack=true" JVM_OPTIONS="$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.WhirlyCacheWrapper"

Added: benchmarks/benchmark-fwk/trunk/jvm_params.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/jvm_params.sh	                        (rev 0)
+++ benchmarks/benchmark-fwk/trunk/jvm_params.sh	2008-09-09 08:14:47 UTC (rev 6696)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+### sets the JVM params for the instance that triggers test runnings
+export JVM_XMS=256m
+export JVM_XMX=1024m
\ No newline at end of file

Modified: benchmarks/benchmark-fwk/trunk/runNode.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/runNode.sh	2008-09-09 08:00:08 UTC (rev 6695)
+++ benchmarks/benchmark-fwk/trunk/runNode.sh	2008-09-09 08:14:47 UTC (rev 6696)
@@ -50,9 +50,9 @@
 fi
 
 . ./bindAddress.sh
-echo bind address exit code is $?
+. ./jvm_params.sh
 
-JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.cacheProductName=${CACHE_PRODUCT} -Dbind.address=${BIND_ADDRESS} -DcacheBenchFwk.cacheConfigFile=${TEST_CFG} -DcurrentIndex=${CURRENT_INDEX} -DclusterSize=${CLUSTER_SIZE} -Djava.net.preferIPv4Stack=${preferIPv4Stack}"
+JVM_OPTIONS="${JVM_OPTIONS} -Xms${JVM_XMS} -Xmx${JVM_XMX} -DcacheBenchFwk.cacheProductName=${CACHE_PRODUCT} -Dbind.address=${BIND_ADDRESS} -DcacheBenchFwk.cacheConfigFile=${TEST_CFG} -DcurrentIndex=${CURRENT_INDEX} -DclusterSize=${CLUSTER_SIZE} -Djava.net.preferIPv4Stack=${preferIPv4Stack}"
 TO_EXECUTE="java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner"
 
 if [ "$DEBUG" = "debug" ]