From: bdemsky <bdemsky>
Date: Fri, 2 Mar 2007 18:00:23 +0000 (+0000)
Subject: changes
X-Git-Tag: preEdgeChange~685
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=570524adf48e70645436ac368450e106a0ddbb1b;p=IRC.git

changes
---

diff --git a/Robust/src/Benchmarks/WebServer/WebServerSocket.java b/Robust/src/Benchmarks/WebServer/WebServerSocket.java
index 67c58f60..8fa20041 100644
--- 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 672780b0..9bb7aa99 100755
--- 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 a11ae99e..53782b5a 100644
--- 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;