add a few more tests

bernd · Jan 17, 2013 · eb4338a · eb4338a
1 parent c2fb2a7
commit eb4338a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/test/speed/bench.conf.erb b/test/speed/bench.conf.erb
@@ -1,4 +1,4 @@
-input { generator { count => 5000000 type => t } } 
+input { generator { count => 4000000 type => t } } 
 filter { metrics { meter => "events" add_tag => m } } 
 output { 
   file { 

diff --git a/test/speed/index.html b/test/speed/index.html
@@ -60,7 +60,7 @@
 
 var y_element = "rate_1m";
 var ranges = {
-  count: { x: [0, 300000], y: [0, 5000000] },
+  count: { x: [0, 300000], y: [0, 4000000] },
   rate_1m: { x: [0, 300000], y: [0, 20000] }
 };
 
@@ -113,7 +113,7 @@
         .attr("y", 6)
         .attr("dy", ".71em")
         .style("text-anchor", "end")
-        .text("count");
+        .text(y_element);
 
     svg.append("path")
         .datum(points)

diff --git a/test/speed/run.sh b/test/speed/run.sh
@@ -24,17 +24,29 @@ run() {
 }
 
 default() {
-  run JRUBY_OPTS= JAVA_OPTS=
+  run JRUBY_OPTS="-Xcompile.invokedynamic=false"
+}
+
+mem4g() {
+  run JRUBY_OPTS="-Xcompile.invokedynamic=false" JAVA_OPTS="-Xmx4g -Xms256m"
 }
 
 indy() {
   run JRUBY_OPTS="-Xcompile.invokedynamic=true"
 }
 
+indy4g() {
+  run JRUBY_OPTS="-Xcompile.invokedynamic=true" JAVA_OPTS="-Xmx4g -Xms256m"
+}
+
 gctune() {
   run JAVA_OPTS="-XX:ReservedCodeCacheSize=128m -XX:+UseBiasedLocking -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:SurvivorRatio=8 -XX:MaxTenuringThreshold=15 -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly -XX:+HeapDumpOnOutOfMemoryError"
 }
 
+gctune4g() {
+  run JAVA_OPTS="-XX:ReservedCodeCacheSize=128m -XX:+UseBiasedLocking -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:SurvivorRatio=8 -XX:MaxTenuringThreshold=15 -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly -XX:+HeapDumpOnOutOfMemoryError -Xmx4g -Xms256m"
+}
+
 cp index.html $workdir/index.html
 
 (
@@ -50,5 +62,8 @@ cp index.html $workdir/index.html
 
 echo "name	env" > $index
 default
+mem4g
 indy
+indy4g
 gctune
+gctune4g