[jbosscache-commits] JBoss Cache SVN: r6473 - in benchmarks/benchmark-fwk/trunk: src/org/cachebench and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-07-31 12:22:57 -0400 (Thu, 31 Jul 2008)
New Revision: 6473

Modified:
   benchmarks/benchmark-fwk/trunk/runAllLocal.sh
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
Log:
Updated to latest snapshot of 3.0 - and allowed ability to use flat map

Modified: benchmarks/benchmark-fwk/trunk/runAllLocal.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/runAllLocal.sh	2008-07-31 16:22:52 UTC (rev 6472)
+++ benchmarks/benchmark-fwk/trunk/runAllLocal.sh	2008-07-31 16:22:57 UTC (rev 6473)
@@ -1,10 +1,18 @@
 #!/bin/bash
 
+# for jdk in java5 java6 java7 ; do
+# source ${jdk}
+jdk=java5
 rm -rf ./output/*
-export JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.fwkCfgFile=cachebench-local.xml -Xms2g -Xmx2g"
+export PLAIN_JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.fwkCfgFile=cachebench-local.xml -Xms2g -Xmx2g"
+unset JVM_OPTIONS && export JVM_OPTIONS=${PLAIN_JVM_OPTIONS}
 ./runLocalNode.sh jbosscache-2.2.0 pess-local.xml
 ./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RR.xml
 ./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RC.xml
+unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -cacheBenchFwk.useFlatCache=true -cacheBenchFwk.productSuffix=FlatCache"
+./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RR.xml
+./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RC.xml
+unset JVM_OPTIONS && export JVM_OPTIONS=${PLAIN_JVM_OPTIONS}
 ./runLocalNode.sh jbosscache-2.2.0 pess-local-NONE.xml
 ./runLocalNode.sh ehcache-1.5.0 ehcache-local.xml
 ./runLocalNode.sh coherence-3.3.1 local-default.xml
@@ -12,5 +20,7 @@
 mkdir output
 mv data* ./output
 
-./generateChart.sh -reportDir output -o MVCC -chartType putget
+./generateChart.sh -reportDir output -o LocalMode-${jdk} -chartType putget
 
+# done
+

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
===================================================================
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java	2008-07-31 16:22:52 UTC (rev 6472)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java	2008-07-31 16:22:57 UTC (rev 6473)
@@ -70,9 +70,12 @@
     */
    private void initJVMParams(String defaultCfgFile)
    {
+      boolean useFlatCache = Boolean.getBoolean("cacheBenchFwk.useFlatCache");
       String overallCfg = System.getProperty("cacheBenchFwk.fwkCfgFile", defaultCfgFile);
       String configuraton = System.getProperty("cacheBenchFwk.cacheConfigFile");
       String cacheProductName = System.getProperty("cacheBenchFwk.cacheProductName");
+      String suffix = System.getProperty("cacheBenchFwk.productSuffix");
+      if (suffix != null && !suffix.trim().equals("")) cacheProductName += suffix;
       String clusterSize = System.getProperty("clusterSize");
       localOnly = Boolean.getBoolean("localOnly");
 
@@ -81,6 +84,7 @@
       if (cacheProductName != null) systemParams.put("cacheProductName", cacheProductName);
       if (clusterSize != null) systemParams.put("clusterSize", clusterSize);
       if (localOnly) systemParams.put("localOnly", "TRUE");
+      if (useFlatCache) systemParams.put("cacheBenchFwk.useFlatCache", "TRUE");
    }
 
    private CacheBenchmarkRunner()