[jboss-cvs] CacheBenchFwk/src/org/cachebench/reportgenerators ...
Manik Surtani
manik at jboss.org
Wed Apr 18 15:09:31 EDT 2007
User: msurtani
Date: 07/04/18 15:09:31
Modified: src/org/cachebench/reportgenerators
CSVReportGenerator.java ReportGenerator.java
Log:
Updated loads of stuff
Revision Changes Path
1.5 +28 -31 CacheBenchFwk/src/org/cachebench/reportgenerators/CSVReportGenerator.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CSVReportGenerator.java
===================================================================
RCS file: /cvsroot/jboss/CacheBenchFwk/src/org/cachebench/reportgenerators/CSVReportGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- CSVReportGenerator.java 13 Mar 2007 14:50:46 -0000 1.4
+++ CSVReportGenerator.java 18 Apr 2007 19:09:31 -0000 1.5
@@ -10,48 +10,33 @@
import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.List;
/**
* @author Manik Surtani (manik at surtani.org)
- * @version $Id: CSVReportGenerator.java,v 1.4 2007/03/13 14:50:46 msurtani Exp $
+ * @version $Id: CSVReportGenerator.java,v 1.5 2007/04/18 19:09:31 msurtani Exp $
*/
-public class CSVReportGenerator implements ReportGenerator
+public class CSVReportGenerator extends AbstractReportGenerator
{
- private File output;
- private TestResult[] results;
private ArrayList footNotes;
- private Log logger = LogFactory.getLog("org.cachebench.reportgenerators.CSVReportGenerator");
- /* (non-Javadoc)
- * @see org.jboss.cachebench.reportgenerators.ReportGenerator#setOutputFile(java.io.File)
- */
- public void setOutputFile(File output)
- {
- this.output = output;
- }
- /* (non-Javadoc)
- * @see org.jboss.cachebench.reportgenerators.ReportGenerator#setResults(junit.framework.TestResult[])
- */
- public void setResults(TestResult[] results)
+ public CSVReportGenerator()
{
- this.results = results;
+ log = LogFactory.getLog(this.getClass());
}
- /* (non-Javadoc)
- * @see org.jboss.cachebench.reportgenerators.ReportGenerator#generate()
- */
public void generate() throws Exception
{
BufferedWriter writer = null;
- logger.debug("Opening output file [" + output + "]");
+ log.debug("Opening output file [" + output + "]");
writer = new BufferedWriter(new FileWriter(output));
writeHeaderLine(writer); // Write the Header of the Report
// Write the results
- for (int i = 0; i < results.length; i++)
+ for (TestResult result : results)
{
- writeTestResult(results[i], writer);
+ writeTestResult(result, writer);
}
// Write the Footnotes (if available)
if (footNotes != null)
@@ -60,7 +45,7 @@
}
writer.close();
- logger.debug("Report complete");
+ log.debug("Report complete");
}
/**
@@ -75,7 +60,7 @@
*/
private void writeTestResult(TestResult result, BufferedWriter writer) throws IOException
{
- logger.debug("Writing the Result to the Report");
+ log.debug("Writing the Result to the Report");
StringBuffer buf = new StringBuffer();
if (result.isTestPassed())
{
@@ -89,6 +74,14 @@
buf.append(",");
buf.append(result.getTestType());
buf.append(",");
+ buf.append(result.getNumMembers());
+ buf.append(",");
+ buf.append(result.getNumThreads());
+ buf.append(",");
+ buf.append(putData.getSum()/1000);
+ buf.append(",");
+ buf.append(getData.getSum()/1000);
+ buf.append(",");
buf.append(putData.getMean());
buf.append(",");
buf.append(getData.getMean());
@@ -109,6 +102,10 @@
buf.append(putData.getMin());
buf.append(",");
buf.append(getData.getMin());
+ buf.append(",");
+ buf.append(result.getThroughputTransactionsPerSecond());
+ buf.append(",");
+ buf.append(result.getThroughputBytesPerSecond());
}
else
{
@@ -136,20 +133,20 @@
}
footNotes.add(result.getFootNote());
}
- logger.debug("Completed writing test result");
+ log.debug("Completed writing test result");
}
private void writeHeaderLine(BufferedWriter writer) throws IOException
{
- logger.debug("Write the Report Header");
- writer.write("TEST NAME, TEST DATE, TEST TYPE, MEAN PUT TIME, MEAN GET TIME, MEDIAN PUT TIME, MEDIAN GET TIME, STANDARD DEVIATION PUT TIME, STANDARD DEVIATION GET TIME, MAX PUT TIME, MAX GET TIME, MIN PUT TIME, MIN GET TIME");
+ log.debug("Write the Report Header");
+ writer.write("TEST NAME, TEST DATE, TEST TYPE, NUM MEMBERS, NUM THREADS, TOTAL PUT TIME (secs), TOTAL GET TIME (secs), MEAN PUT TIME, MEAN GET TIME, MEDIAN PUT TIME, MEDIAN GET TIME, STANDARD DEVIATION PUT TIME, STANDARD DEVIATION GET TIME, MAX PUT TIME, MAX GET TIME, MIN PUT TIME, MIN GET TIME, THROUGHPUT TRANSACTIONS PER SEC, THROUGHPUT BYTES PER SEC");
writer.newLine();
- logger.debug("Complted the Report Header");
+ log.debug("Complted the Report Header");
}
private void writeFoodNotes(BufferedWriter writer) throws IOException
{
- logger.debug("Writing the Footnotes");
+ log.debug("Writing the Footnotes");
writer.newLine();
writer.newLine();
writer.newLine();
@@ -162,6 +159,6 @@
writer.write((String) footNotes.get(i));
writer.newLine();
}
- logger.debug("Complted the Footnotes");
+ log.debug("Complted the Footnotes");
}
}
1.4 +3 -2 CacheBenchFwk/src/org/cachebench/reportgenerators/ReportGenerator.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ReportGenerator.java
===================================================================
RCS file: /cvsroot/jboss/CacheBenchFwk/src/org/cachebench/reportgenerators/ReportGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ReportGenerator.java 13 Mar 2007 14:50:46 -0000 1.3
+++ ReportGenerator.java 18 Apr 2007 19:09:31 -0000 1.4
@@ -3,17 +3,18 @@
import org.cachebench.TestResult;
import java.io.File;
+import java.util.List;
/**
* @author Manik Surtani (manik at surtani.org)
- * @version $Id: ReportGenerator.java,v 1.3 2007/03/13 14:50:46 msurtani Exp $
+ * @version $Id: ReportGenerator.java,v 1.4 2007/04/18 19:09:31 msurtani Exp $
*/
public interface ReportGenerator
{
public void setOutputFile(File output);
- public void setResults(TestResult[] results);
+ public void setResults(List<TestResult> results);
public void generate() throws Exception;
}
More information about the jboss-cvs-commits
mailing list