You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by bu...@apache.org on 2005/03/09 20:36:44 UTC

svn commit: r156673 - in jakarta/commons/sandbox/benchmark/trunk/src: java/org/apache/commons/benchmark/Benchmark.java java/org/apache/commons/benchmark/xmlrpc/BenchmarkHandler.java test/org/apache/commons/benchmark/Test1.java

Author: burton
Date: Wed Mar  9 11:36:41 2005
New Revision: 156673

URL: http://svn.apache.org/viewcvs?view=rev&rev=156673
Log:
support for returning results as hashlists... 

Modified:
    jakarta/commons/sandbox/benchmark/trunk/src/java/org/apache/commons/benchmark/Benchmark.java
    jakarta/commons/sandbox/benchmark/trunk/src/java/org/apache/commons/benchmark/xmlrpc/BenchmarkHandler.java
    jakarta/commons/sandbox/benchmark/trunk/src/test/org/apache/commons/benchmark/Test1.java

Modified: jakarta/commons/sandbox/benchmark/trunk/src/java/org/apache/commons/benchmark/Benchmark.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/benchmark/trunk/src/java/org/apache/commons/benchmark/Benchmark.java?view=diff&r1=156672&r2=156673
==============================================================================
--- jakarta/commons/sandbox/benchmark/trunk/src/java/org/apache/commons/benchmark/Benchmark.java (original)
+++ jakarta/commons/sandbox/benchmark/trunk/src/java/org/apache/commons/benchmark/Benchmark.java Wed Mar  9 11:36:41 2005
@@ -304,6 +304,9 @@
             "," +
             "duration:" +
             getTracker1().now.getDuration() +
+            "," +
+            "meanDuration:" +
+            getTracker1().now.getMeanDuration() +
             ")" + 
             " " +
             "last=("  +
@@ -312,6 +315,12 @@
             "," +
             "completed:" +
             getTracker1().last.getCompleted() +
+            "," +
+            "duration:" +
+            getTracker1().now.getDuration() +
+            "," +
+            "meanDuration:" +
+            getTracker1().now.getMeanDuration() +
             ")";
             
     }

Modified: jakarta/commons/sandbox/benchmark/trunk/src/java/org/apache/commons/benchmark/xmlrpc/BenchmarkHandler.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/benchmark/trunk/src/java/org/apache/commons/benchmark/xmlrpc/BenchmarkHandler.java?view=diff&r1=156672&r2=156673
==============================================================================
--- jakarta/commons/sandbox/benchmark/trunk/src/java/org/apache/commons/benchmark/xmlrpc/BenchmarkHandler.java (original)
+++ jakarta/commons/sandbox/benchmark/trunk/src/java/org/apache/commons/benchmark/xmlrpc/BenchmarkHandler.java Wed Mar  9 11:36:41 2005
@@ -54,5 +54,47 @@
                            .getTracker1().getLast().getMeanDuration() );
     }
 
+    public Hashtable getBenchmarkAsHashtable( String name ) {
+
+        Benchmark benchmark = Benchmark.getBenchmark( name );
+
+        if ( benchmark == null )
+            return null;
+
+        Hashtable map = new Hashtable();
+
+        //map.put( "1min.now.duration", new Double( benchmark.getTracker1().getNow().duration ) );
+        //map.put( "1min.last.duration", new Double( benchmark.getTracker1().getNow().duration ) );
+
+        addHashtableMetrics( map, benchmark.getTracker1().getLast(), "1min.last." );
+        addHashtableMetrics( map, benchmark.getTracker5().getLast(), "5min.last." );
+        addHashtableMetrics( map, benchmark.getTracker15().getLast(), "15min.last." );
+        
+        return map;
+        
+    }
+
+    public void addHashtableMetrics( Hashtable map, BenchmarkMeta meta, String prefix ) {
+
+        map.put( prefix + "duration", new Double( meta.getDuration() ) );
+        map.put( prefix + "meanDuration", new Double( meta.getMeanDuration() ) );
+        map.put( prefix + "completed", new Double( meta.getCompleted() ) );
+        map.put( prefix + "started", new Double( meta.getStarted() ) );
+        
+    }
+    
+    /*
+      Add support for getting values back as a hashmap
+
+        duration1=N
+        duration5=N
+        duration15=N
+
+        completed1=N
+        completed5=N
+        completed15=N
+
+    */
+        
 }
 

Modified: jakarta/commons/sandbox/benchmark/trunk/src/test/org/apache/commons/benchmark/Test1.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/benchmark/trunk/src/test/org/apache/commons/benchmark/Test1.java?view=diff&r1=156672&r2=156673
==============================================================================
--- jakarta/commons/sandbox/benchmark/trunk/src/test/org/apache/commons/benchmark/Test1.java (original)
+++ jakarta/commons/sandbox/benchmark/trunk/src/test/org/apache/commons/benchmark/Test1.java Wed Mar  9 11:36:41 2005
@@ -33,8 +33,6 @@
         super(testName);
     }
 
-    //FIXME: test with using really short intervals but with diff values.
-
     public void testXmlrpc() throws Exception {
 
         WebServer webserver = new WebServer ( 2048 );
@@ -76,9 +74,15 @@
         Object result = xmlrpc.execute ( "benchmark.getLastCompleted", params );
 
         assertEquals( new Double( 1 ), result );
+
+        //now call getBenchmark on the service to get it back as a hashmap
+
+        result = xmlrpc.execute ( "benchmark.getBenchmarkAsHashtable", params );
+
+        System.out.println( "result: " + result );
         
     }
-    
+
     public void testDuration() throws Exception {
 
         Benchmark.DISABLE_LOCAL = false;



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org