changes

diff --git a/Robust/src/Benchmarks/WebServer/WebServerSocket.java b/Robust/src/Benchmarks/WebServer/WebServerSocket.java
index 67c58f60c376ce4780275a977633c915d6ef82cf..8fa20041f8400d11ef9cad8f44a71fb9cca2181b 100644 (file)
--- a/Robust/src/Benchmarks/WebServer/WebServerSocket.java
+++ b/Robust/src/Benchmarks/WebServer/WebServerSocket.java
@@ -75,7 +75,6 @@ public class WebServerSocket extends Socket {
                    int index = prefix.indexOf('/');//Parse the GET client request to find filename
                    int end = prefix.indexOf('H');
                    filename = prefix.subString((index+1), (end-1));
-                   System.printString("\n");
                    return true;
                }
                return false;

diff --git a/Robust/src/Benchmarks/WebServer/Workload/batch/run2.sh b/Robust/src/Benchmarks/WebServer/Workload/batch/run2.sh
index 672780b0b6c3afe38922bcb95c845068707788f3..9bb7aa994b43aad19f523be40c73a4db211cc22b 100755 (executable)
--- a/Robust/src/Benchmarks/WebServer/Workload/batch/run2.sh
+++ b/Robust/src/Benchmarks/WebServer/Workload/batch/run2.sh
@@ -11,13 +11,13 @@ export BRISTLECONE="-initializerandom -injectinstructionfailures 35 0.00001667 5
 rm -rf results
 mkdir results
 cd results
-while [ $i -le 299 ]; # The number of runs 
+while [ $i -le 201 ]; # The number of runs 
   do
   mkdir trial$i
   cd trial$i
   let errorcount=0
   let count=0
-  ../../trans.bin & #Launch server executable in background
+  ../../trans.bin &> log & #Launch server executable in background
   sleep 2;
   ../../Workload/workload 127.0.0.1 2>/dev/null & #Run the first workload
   echo $i >> ../output;
@@ -54,7 +54,7 @@ echo Errorcount=$errorcount >> ../output
 let "i+=1";
 process=`ps | grep workload | grep -v grep | awk '{print $1}'`
 kill -9 $process
-ps | grep trans | grep -v grep | awk '{print $1}' | xargs kill -9 #Kill the server 
+ps | grep trans | grep -v grep | awk '{print $1}' | xargs kill #Kill the server 
 sleep 1;
 cd ..
 done

diff --git a/Robust/src/Benchmarks/WebServerJava/WebServerThread.java b/Robust/src/Benchmarks/WebServerJava/WebServerThread.java
index a11ae99e2daba545c13e995abd62b8952739a3c8..53782b5ac68e9dc47294ccc31eb2a067e11ed729 100644 (file)
--- a/Robust/src/Benchmarks/WebServerJava/WebServerThread.java
+++ b/Robust/src/Benchmarks/WebServerJava/WebServerThread.java
@@ -160,7 +160,7 @@ public class WebServerThread extends Thread {
            int index = prefix.indexOf('/');//Parse the GET client request to find filename
            int end = prefix.indexOf('H');
            filename = prefix.subString((index+1), (end-1));
-           System.printString("\n");
+           //      System.printString("\n");
            return true;
        }
        return false;