Started adding wrk support.

config/resin.properties

@@ -88,9 +88,9 @@ jvm_mode    : -server
 # http_ping_urls : http://127.0.0.1/test.jsp
 
 # Throttle the number of active threads for a port
-port_thread_max   : 500
-accept_thread_max : 64
-accept_thread_min : 16
+port_thread_max   : 512
+accept_thread_max : 256
+accept_thread_min : 256
 
 # Enable JNI TCP speed optimizations
 tcp_cork : true

framework_test.py

@@ -16,19 +16,19 @@ class FrameworkTest:
     echo ""
     echo "---------------------------------------------------------"
     echo " Running Warmup {name}"
-    echo " weighttp -k -n {runs} -c {max_concurrency} -t {max_threads} {server_host}:{port}{url}"
+    echo " wrk -r {runs} -c {max_concurrency} -t {max_threads} http://{server_host}:{port}{url}"
     echo "---------------------------------------------------------"
     echo ""
-    weighttp -k -n {runs} -c {max_concurrency} -t {max_threads} {server_host}:{port}{url}
+    wrk -r {runs} -c {max_concurrency} -t {max_threads} http://{server_host}:{port}{url}
     for c in {interval}
     do
       echo ""
       echo "---------------------------------------------------------"
       echo " Concurrency: $c for {name}"
-      echo " weighttp -k -n {runs} -c $c -t $(($c>{max_threads}?{max_threads}:$c)) {server_host}:{port}{url}"
+      echo " wrk -n {runs} -c $c -t $(($c>{max_threads}?{max_threads}:$c)) http://{server_host}:{port}{url}"
       echo "---------------------------------------------------------"
       echo ""
-      weighttp -k -n {runs} -c "$c" -t "$(($c>{max_threads}?{max_threads}:$c))" {server_host}:{port}{url}
+      wrk -r {runs} -c "$c" -t "$(($c>{max_threads}?{max_threads}:$c))" http://{server_host}:{port}{url}
     done
   """
 
@@ -38,19 +38,19 @@ class FrameworkTest:
     echo ""
     echo "---------------------------------------------------------"
     echo " Running Warmup {name}"
-    echo " weighttp -k -n {runs} -c {max_concurrency} -t {max_threads} {server_host}:{port}{url}2"
+    echo " wrk -r {runs} -c {max_concurrency} -t {max_threads} http://{server_host}:{port}{url}2"
     echo "---------------------------------------------------------"
     echo ""
-    weighttp -k -n {runs} -c {max_concurrency} -t {max_threads} {server_host}:{port}{url}2
+    wrk -r {runs} -c {max_concurrency} -t {max_threads} http://{server_host}:{port}{url}2
     for c in {interval}
     do
       echo ""
       echo "---------------------------------------------------------"
       echo " Queries: $c for {name}"
-      echo " weighttp -k -n {runs} -c {max_concurrency} -t {max_threads} {server_host}:{port}{url}$c"
+      echo " wrk -r {runs} -c {max_concurrency} -t {max_threads} http://{server_host}:{port}{url}$c"
       echo "---------------------------------------------------------"
       echo ""
-      weighttp -k -n {runs} -c {max_concurrency} -t {max_threads} {server_host}:{port}{url}"$c"
+      wrk -r {runs} -c {max_concurrency} -t {max_threads} http://{server_host}:{port}{url}"$c"
     done
   """
 
@@ -216,14 +216,14 @@ class FrameworkTest:
       with open(self.benchmarker.output_file(self.name, test_type)) as raw_data:
         found_warmup = False
         for line in raw_data:
-          # weighttp outputs a line with the "req/s" number for each run
-          if "req/s" in line:
+          # wrk outputs a line with the "Requests/sec:" number for each run
+          if "Requests/sec:" in line:
             # Every raw data file first has a warmup run, so we need to pass over that before we begin parsing
             if not found_warmup:
               found_warmup = True
               continue
 
-            m = re.search("([0-9]+) req/s", line)
+            m = re.search("Requests/sec: ([0-9]+)", line)
             results['results'].append(m.group(1))
 
           if found_warmup:

installer.py

@@ -272,6 +272,16 @@ class Installer:
     ./waf build
     sudo ./waf install
     cd ~
+    
+    ##############################
+    # wrk
+    ##############################
+
+    git clone https://github.com/wg/wrk.git
+    cd wrk
+    make
+    sudo cp wrk /usr/local/bin
+    cd ~
 
     ##############################
     # MongoDB