Author: mircea.markus Date: 2008-07-23 20:48:02 -0400 (Wed, 23 Jul 2008) New Revision: 6387 Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java Log: setup shouled be run before warmup Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java =================================================================== --- benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java 2008-07-24 00:24:57 UTC (rev 6386) +++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java 2008-07-24 00:48:02 UTC (rev 6387) @@ -155,12 +155,9 @@ cache = newCache(test); if (cache != null) { - if (!localOnly) barrier("BEFORE_WARMUP"); - warmupCache(test, cache); - if (!localOnly) barrier("AFTER_WARMUP"); - //now start testing cache.setUp(); + warmupCache(test, cache); List<TestResult> resultsForCache = runTestsOnCache(cache, test); if (!localOnly) barrier("AFTER_TEST_RUN"); shutdownCache(cache); @@ -198,6 +195,7 @@ private void warmupCache(TestCase test, CacheWrapper cache) throws Exception { + if (!localOnly) barrier("BEFORE_WARMUP"); log.info("Warming up.."); CacheWarmupConfig warmupConfig = test.getCacheWarmupConfig(); log.trace("Warmup config is: " + warmupConfig); @@ -205,6 +203,7 @@ warmup.setConfigParams(warmupConfig.getParams()); warmup.warmup(cache); log.info("Warmup ended!"); + if (!localOnly) barrier("AFTER_WARMUP"); } /**