[jbosscache-commits] JBoss Cache SVN: r6440 - benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-07-30 11:23:30 -0400 (Wed, 30 Jul 2008)
New Revision: 6440

Modified:
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/AbstractChartGen.java
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/PutGetChartGenerator.java
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ThroughputChartGenerator.java
Log:
Added VM and OS stats to the report

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/AbstractChartGen.java
===================================================================
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/AbstractChartGen.java	2008-07-30 12:30:50 UTC (rev 6439)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/AbstractChartGen.java	2008-07-30 15:23:30 UTC (rev 6440)
@@ -1,5 +1,9 @@
 package org.cachebench.reportgenerators;
 
+import org.jfree.chart.title.TextTitle;
+
+import java.util.Date;
+
 public abstract class AbstractChartGen implements ChartGen
 {
    protected String reportDirectory;
@@ -16,4 +20,12 @@
    {
       this.filenamePrefix = fnPrefix;
    }
+
+   protected TextTitle getSubtitle()
+   {
+      return new TextTitle("Generated on " + new Date() + " by The CacheBenchFwk\nJDK: " +
+            System.getProperty("java.vm.name") + " (" + System.getProperty("java.vm.version") + ", " +
+            System.getProperty("java.vm.vendor") + ") OS: " + System.getProperty("os.name") + " (" +
+            System.getProperty("os.version") + ", " + System.getProperty("os.arch") + ")");
+   }
 }

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/PutGetChartGenerator.java
===================================================================
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/PutGetChartGenerator.java	2008-07-30 12:30:50 UTC (rev 6439)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/PutGetChartGenerator.java	2008-07-30 15:23:30 UTC (rev 6440)
@@ -8,7 +8,6 @@
 import org.jfree.chart.labels.CategoryItemLabelGenerator;
 import org.jfree.chart.plot.PlotOrientation;
 import org.jfree.chart.renderer.category.BarRenderer3D;
-import org.jfree.chart.title.TextTitle;
 import org.jfree.data.category.CategoryDataset;
 import org.jfree.data.category.DefaultCategoryDataset;
 
@@ -19,7 +18,6 @@
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.text.NumberFormat;
-import java.util.Date;
 import java.util.StringTokenizer;
 
 /**
@@ -102,7 +100,7 @@
          }
       });
 
-      chart.addSubtitle(new TextTitle("Generated on " + new Date() + " by The CacheBenchFwk"));
+      chart.addSubtitle(getSubtitle());
 
       chart.setBorderVisible(true);
       chart.setAntiAlias(true);

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ThroughputChartGenerator.java
===================================================================
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ThroughputChartGenerator.java	2008-07-30 12:30:50 UTC (rev 6439)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ThroughputChartGenerator.java	2008-07-30 15:23:30 UTC (rev 6440)
@@ -5,7 +5,6 @@
 import org.jfree.chart.ChartUtilities;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.plot.PlotOrientation;
-import org.jfree.chart.title.TextTitle;
 import org.jfree.data.category.CategoryDataset;
 import org.jfree.data.category.DefaultCategoryDataset;
 
@@ -15,7 +14,6 @@
 import java.io.FileReader;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.util.Date;
 import java.util.Map;
 import java.util.SortedMap;
 import java.util.StringTokenizer;
@@ -61,7 +59,7 @@
    private JFreeChart createChart(CategoryDataset data, String title, String yLabel)
    {
       JFreeChart chart = ChartFactory.createLineChart(title, "Cluster size (number of cache instances)", yLabel, data, PlotOrientation.VERTICAL, true, false, false);
-      chart.addSubtitle(new TextTitle("Generated on " + new Date() + " by The CacheBenchFwk"));
+      chart.addSubtitle(getSubtitle());
       chart.setBorderVisible(true);
       chart.setAntiAlias(true);
       chart.setTextAntiAlias(true);