[jbosscache-commits] JBoss Cache SVN: r5087 - benchmarks/benchmark-fwk.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2008-01-08 15:05:42 -0500 (Tue, 08 Jan 2008)
New Revision: 5087

Modified:
   benchmarks/benchmark-fwk/runNode.sh
Log:


Modified: benchmarks/benchmark-fwk/runNode.sh
===================================================================
--- benchmarks/benchmark-fwk/runNode.sh	2008-01-08 19:54:54 UTC (rev 5086)
+++ benchmarks/benchmark-fwk/runNode.sh	2008-01-08 20:05:42 UTC (rev 5087)
@@ -3,10 +3,8 @@
 # cygwin users: add the scripts from :pserver:anoncvs at cygwin.com:/cvs/cygwin-apps/wrappers/java to the $cygwin_home/usr/local/bin
 # those would make an automatic conversion from unix CLASSPATH to win classpath, needed when executing java -cp
 
-CACHE_DEBUG=true
 preferIPv4Stack=true
-export JVM_ARGS=-Xmx1024m
-export OTHER_SYS_ARGS=$3
+export JVM_OPTIONS=" -DcurrentIndex=$1 -DclusterSize=$3 " 
 
 if [ -z $1 ]
 then
@@ -14,12 +12,12 @@
    echo "     ./runNode.sh currentNodeIndex testConfig otherSysProps customConfigFile"
    echo "currentNodeIndex : the index of this node in the list of nodes in the cluster(0..n)"
    echo "testConfig       : must be one of the directories names under 'cache-products'"
-   echo "other params     : should be used to pass -D arguments to the custom plugins. e.g. JBossCache might need an 'bindAddress' argument"
-   echo "customConfigFile : the path to the a custom 'cachebenchmark.xml' (other than the one in 'conf' dir which is loaded by default)"
+   echo "cluster size"
+   echo "Ex: ./runNode.sh 0 jbosscache-2.0.0 3"
    exit 0
 fi
 
-export SYS_PROPS="-DcurrentIndex=$1 -Dorg.cachebench.debug=$CACHE_DEBUG -Djava.net.preferIPv4Stack=$preferIPv4Stack"
+export SYS_PROPS="-DcurrentIndex=$1 -Djava.net.preferIPv4Stack=$preferIPv4Stack"
 
 #first kill all the exisiting processes as they might interfere with the new ones/ not sure this works on cygwin
 ps -fe | grep "Cache*BenchmarkRunner" | cut -c 10-20 | xargs -r kill
@@ -31,14 +29,11 @@
 #libraries needed by the fwk, add them to the classpath
 for JAR in ./lib/*
 do
-   FWK_CLASS_PATH=$FWK_CLASS_PATH:$JAR
+   CLASSPATH=$CLASSPATH:$JAR
 done
 
-FWK_CLASS_PATH=$FWK_CLASS_PATH:./conf:./classes/production/Framework
-export FWK_CLASS_PATH
+export CLASSPATH=$CLASSPATH:./conf:./classes/production/Framework
 
-CLASSPATH=$FWK_CLASS_PATH:$CLASSPATH
-
 configFile=./cache-products/$2/config.sh
 
 #first check whether the config file exists and load it
@@ -50,13 +45,8 @@
   exit 1
 fi
 
-if [ -n "$START_NODE_COMMAND" ]
-then
-   echo executing command $START_NODE_COMMAND
-   $START_NODE_COMMAND
-else   
-   TO_EXECUTE="java $JVM_ARGS -cp $CLASSPATH $OTHER_SYS_ARGS $SYS_PROPS org.cachebench.CacheBenchmarkRunner $4"
-   echo executing $TO_EXECUTE
-   java $JVM_ARGS -cp $CLASSPATH $OTHER_SYS_ARGS $SYS_PROPS org.cachebench.CacheBenchmarkRunner $4
-fi
+TO_EXECUTE="java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner"
+echo executing:
+echo $TO_EXECUTE
+java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner