activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r961175 - in /activemq/sandbox/activemq-apollo-actor: activemq-broker/src/test/resources/org/apache/activemq/apollo/broker/perf/ activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/ activemq-stomp/src/test/scala/org/apache...
Date Wed, 07 Jul 2010 04:13:56 GMT
Author: chirino
Date: Wed Jul  7 04:13:56 2010
New Revision: 961175

URL: http://svn.apache.org/viewvc?rev=961175&view=rev
Log:
benchmark impl can now inject a description into the generated report.

Modified:
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/resources/org/apache/activemq/apollo/broker/perf/persistent-report.html
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/resources/org/apache/activemq/apollo/broker/perf/report.html
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BrokerPerfSupport.scala
    activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/resources/org/apache/activemq/apollo/broker/perf/persistent-report.html
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/resources/org/apache/activemq/apollo/broker/perf/persistent-report.html?rev=961175&r1=961174&r2=961175&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/resources/org/apache/activemq/apollo/broker/perf/persistent-report.html
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/resources/org/apache/activemq/apollo/broker/perf/persistent-report.html
Wed Jul  7 04:13:56 2010
@@ -246,6 +246,7 @@
           broker ack before sending the next message.  Consumers client ack
           each message.  
         </p>
+        <p><!-- DESCRIPTION-START --><!-- DESCRIPTION-END --></p>
 
         <h2>General</h2>
 

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/resources/org/apache/activemq/apollo/broker/perf/report.html
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/resources/org/apache/activemq/apollo/broker/perf/report.html?rev=961175&r1=961174&r2=961175&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/resources/org/apache/activemq/apollo/broker/perf/report.html
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/resources/org/apache/activemq/apollo/broker/perf/report.html
Wed Jul  7 04:13:56 2010
@@ -269,6 +269,7 @@
           Producers are sending non-persistent messages and do NOT wait for
           a broker ack before sending the next message.  Consumers auto ack.
         </p>
+        <p><!-- DESCRIPTION-START --><!-- DESCRIPTION-END --></p>
 
         <h2>General</h2>
 

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BrokerPerfSupport.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BrokerPerfSupport.scala?rev=961175&r1=961174&r2=961175&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BrokerPerfSupport.scala
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BrokerPerfSupport.scala
Wed Jul  7 04:13:56 2010
@@ -120,13 +120,15 @@ abstract class BrokerPerfSupport extends
     val basedir = new File(System.getProperty("user.home", "."))
     val htmlFile = new File(basedir, reportTargetName)
 
-    val report_parser = """(?s)(.*// DATA-START\r?\n)(.*)(// DATA-END.*)""".r
+    val report_parser = """(?s)(.*// DATA-START\r?\n)(.*)(// DATA-END.*<!-- DESCRIPTION-START
-->)(.*)(<!-- DESCRIPTION-END -->.*)""".r
+
+
 
     // Load the previous dataset if the file exists
     var report_data = ""
     if( htmlFile.exists ) {
       IOHelper.readText(htmlFile) match {
-        case report_parser(_, data, _) =>
+        case report_parser(_, data, _, _, _) =>
           report_data = data.stripLineEnd
         case _ =>
           println("could not parse existing report file: "+htmlFile)
@@ -136,7 +138,7 @@ abstract class BrokerPerfSupport extends
     // Load the report template and parse it..
     val template = IOHelper.readText(reportResourceTemplate.openStream)
     template match {
-      case report_parser(report_header, _, report_footer) =>
+      case report_parser(report_header, _, report_mid, _, report_footer) =>
         var notes = System.getProperty("notes")
         if( notes==null ) {
           val version = new String(ProcessSupport.system("git", "rev-list", "--max-count=1",
"HEAD").toByteArray).trim
@@ -147,7 +149,7 @@ abstract class BrokerPerfSupport extends
           report_data += ",\n"
         }
         report_data += "            ['"+jsescape(notes)+"', "+samples.map(x=>String.format("%.2f",x._2)).mkString(",
")+"]\n"
-        IOHelper.writeText(htmlFile, report_header+report_data+report_footer)
+        IOHelper.writeText(htmlFile, report_header+report_data+report_mid+description+report_footer)
       case _ =>
         println("could not parse template report file")
     }
@@ -161,6 +163,8 @@ abstract class BrokerPerfSupport extends
     }
   }
 
+  def description = ""
+
   def jsescape(value:String) = {
     var rc = ""
     value.foreach{ c=>

Modified: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala?rev=961175&r1=961174&r2=961175&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala
Wed Jul  7 04:13:56 2010
@@ -34,6 +34,8 @@ import org.apache.activemq.apollo.dto.{B
 
 class StompBrokerPerfTest extends BaseBrokerPerfSupport {
 
+  override def description = "Using the STOMP protocol over TCP"
+
   override def createProducer() = new StompRemoteProducer()
 
   override def createConsumer() = new StompRemoteConsumer()
@@ -43,7 +45,9 @@ class StompBrokerPerfTest extends BaseBr
 }
 
 class StompPersistentBrokerPerfTest extends BasePersistentBrokerPerfSupport {
-  
+
+  override def description = "Using the STOMP protocol over TCP with no store."
+
   override def createProducer() = new StompRemoteProducer()
 
   override def createConsumer() = new StompRemoteConsumer()
@@ -54,6 +58,8 @@ class StompPersistentBrokerPerfTest exte
 
 class StompHawtDBPersistentBrokerPerfTest extends BasePersistentBrokerPerfSupport {
 
+  override def description = "Using the STOMP protocol over TCP persisting to the HawtDB
store."
+
   println(getClass.getClassLoader.getResource("log4j.properties"))
 
   override def createProducer() = new StompRemoteProducer()



Mime
View raw message