From c2bd38d7434317d24a2ae90db8696a7e3159d9d5 Mon Sep 17 00:00:00 2001
From: jihoonl <jihoonl>
Date: Sat, 13 Feb 2010 00:09:44 +0000
Subject: [PATCH] change

---
 .../src/Benchmarks/Recovery/FileSystem/java/makefile |  9 +++++++++
 Robust/src/Benchmarks/Recovery/FileSystem/makefile   |  9 ---------
 .../FileSystem/{ => recovery}/FileSystem.java        |  8 ++++++--
 .../Recovery/FileSystem/{ => recovery}/dstm.conf     |  0
 .../Benchmarks/Recovery/FileSystem/recovery/makefile |  9 +++++++++
 .../Benchmarks/Recovery/MatrixMultiply/java/makefile |  9 +++++++++
 .../{ => recovery}/MatrixMultiply.java               |  4 ++--
 .../Recovery/MatrixMultiply/{ => recovery}/dstm.conf |  1 +
 .../Recovery/MatrixMultiply/{ => recovery}/makefile  |  2 +-
 .../SpamFilter/{ => recovery}/BufferedReader.java    |  0
 .../{ => recovery}/DistributedHashMap.java           |  0
 .../{ => recovery}/EphemeralSignature.java           |  0
 .../SpamFilter/{ => recovery}/FilterResult.java      |  0
 .../SpamFilter/{ => recovery}/FilterStatistic.java   |  0
 .../Recovery/SpamFilter/{ => recovery}/GString.java  |  0
 .../SpamFilter/{ => recovery}/HashEntry.java         |  0
 .../Recovery/SpamFilter/{ => recovery}/HashStat.java |  0
 .../Recovery/SpamFilter/{ => recovery}/MD5.java      |  2 +-
 .../Recovery/SpamFilter/{ => recovery}/Mail.java     |  0
 .../SpamFilter/{ => recovery}/SignatureComputer.java |  0
 .../SpamFilter/{ => recovery}/SpamFilter.java        |  2 +-
 .../SpamFilter/{ => recovery}/WhiplashSignature.java |  2 +-
 .../Recovery/SpamFilter/{ => recovery}/dstm.conf     |  0
 .../Recovery/SpamFilter/{ => recovery}/makefile      |  2 +-
 Robust/src/Benchmarks/Recovery/Spider/java/makefile  |  2 +-
 Robust/src/Benchmarks/Recovery/Spider/makefile       | 12 ------------
 .../Recovery/Spider/{ => recovery}/GlobalQuery.java  |  0
 .../Recovery/Spider/{ => recovery}/LocalQuery.java   |  0
 .../Recovery/Spider/{ => recovery}/QueryTask.java    |  0
 .../Recovery/Spider/{ => recovery}/Spider.java       |  6 ++++--
 .../Recovery/Spider/{ => recovery}/dstm.conf         |  2 +-
 .../src/Benchmarks/Recovery/Spider/recovery/makefile | 12 ++++++++++++
 Robust/src/Benchmarks/Recovery/bm_args.txt           |  2 +-
 Robust/src/Benchmarks/Recovery/runjava.sh            |  6 ++++--
 34 files changed, 64 insertions(+), 37 deletions(-)
 create mode 100644 Robust/src/Benchmarks/Recovery/FileSystem/java/makefile
 delete mode 100644 Robust/src/Benchmarks/Recovery/FileSystem/makefile
 rename Robust/src/Benchmarks/Recovery/FileSystem/{ => recovery}/FileSystem.java (93%)
 rename Robust/src/Benchmarks/Recovery/FileSystem/{ => recovery}/dstm.conf (100%)
 create mode 100644 Robust/src/Benchmarks/Recovery/FileSystem/recovery/makefile
 create mode 100644 Robust/src/Benchmarks/Recovery/MatrixMultiply/java/makefile
 rename Robust/src/Benchmarks/Recovery/MatrixMultiply/{ => recovery}/MatrixMultiply.java (98%)
 rename Robust/src/Benchmarks/Recovery/MatrixMultiply/{ => recovery}/dstm.conf (91%)
 rename Robust/src/Benchmarks/Recovery/MatrixMultiply/{ => recovery}/makefile (77%)
 rename Robust/src/Benchmarks/Recovery/SpamFilter/{ => recovery}/BufferedReader.java (100%)
 rename Robust/src/Benchmarks/Recovery/SpamFilter/{ => recovery}/DistributedHashMap.java (100%)
 rename Robust/src/Benchmarks/Recovery/SpamFilter/{ => recovery}/EphemeralSignature.java (100%)
 rename Robust/src/Benchmarks/Recovery/SpamFilter/{ => recovery}/FilterResult.java (100%)
 rename Robust/src/Benchmarks/Recovery/SpamFilter/{ => recovery}/FilterStatistic.java (100%)
 rename Robust/src/Benchmarks/Recovery/SpamFilter/{ => recovery}/GString.java (100%)
 rename Robust/src/Benchmarks/Recovery/SpamFilter/{ => recovery}/HashEntry.java (100%)
 rename Robust/src/Benchmarks/Recovery/SpamFilter/{ => recovery}/HashStat.java (100%)
 rename Robust/src/Benchmarks/Recovery/SpamFilter/{ => recovery}/MD5.java (99%)
 rename Robust/src/Benchmarks/Recovery/SpamFilter/{ => recovery}/Mail.java (100%)
 rename Robust/src/Benchmarks/Recovery/SpamFilter/{ => recovery}/SignatureComputer.java (100%)
 rename Robust/src/Benchmarks/Recovery/SpamFilter/{ => recovery}/SpamFilter.java (99%)
 rename Robust/src/Benchmarks/Recovery/SpamFilter/{ => recovery}/WhiplashSignature.java (99%)
 rename Robust/src/Benchmarks/Recovery/SpamFilter/{ => recovery}/dstm.conf (100%)
 rename Robust/src/Benchmarks/Recovery/SpamFilter/{ => recovery}/makefile (88%)
 delete mode 100644 Robust/src/Benchmarks/Recovery/Spider/makefile
 rename Robust/src/Benchmarks/Recovery/Spider/{ => recovery}/GlobalQuery.java (100%)
 rename Robust/src/Benchmarks/Recovery/Spider/{ => recovery}/LocalQuery.java (100%)
 rename Robust/src/Benchmarks/Recovery/Spider/{ => recovery}/QueryTask.java (100%)
 rename Robust/src/Benchmarks/Recovery/Spider/{ => recovery}/Spider.java (95%)
 rename Robust/src/Benchmarks/Recovery/Spider/{ => recovery}/dstm.conf (100%)
 create mode 100644 Robust/src/Benchmarks/Recovery/Spider/recovery/makefile

diff --git a/Robust/src/Benchmarks/Recovery/FileSystem/java/makefile b/Robust/src/Benchmarks/Recovery/FileSystem/java/makefile
new file mode 100644
index 00000000..ab7f23e7
--- /dev/null
+++ b/Robust/src/Benchmarks/Recovery/FileSystem/java/makefile
@@ -0,0 +1,9 @@
+MAINCLASS=FileSystem
+SRC1=${MAINCLASS}.java
+FLAGS= -optimize -thread -mainclass ${MAINCLASS}
+default:
+	../../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC1}
+
+clean:
+	rm -rf tmpbuilddirectory
+	rm *.bin
diff --git a/Robust/src/Benchmarks/Recovery/FileSystem/makefile b/Robust/src/Benchmarks/Recovery/FileSystem/makefile
deleted file mode 100644
index 07625ee5..00000000
--- a/Robust/src/Benchmarks/Recovery/FileSystem/makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-MAINCLASS=FileSystem
-SRC1=${MAINCLASS}.java 
-FLAGS= -recoverystats -dsm -dsmtask -32bit -recovery -nooptimize -mainclass ${MAINCLASS}
-default:
-	../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC1}
-
-clean:
-	rm -rf tmpbuilddirectory
-	rm *.bin
diff --git a/Robust/src/Benchmarks/Recovery/FileSystem/FileSystem.java b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java
similarity index 93%
rename from Robust/src/Benchmarks/Recovery/FileSystem/FileSystem.java
rename to Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java
index ffae3b38..180d35b2 100644
--- a/Robust/src/Benchmarks/Recovery/FileSystem/FileSystem.java
+++ b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java
@@ -23,13 +23,13 @@ public class FileSystem extends Thread {
 		this.fs = fs;
 		this.dir_list = dir_list;
 		this.mid = mid;
-		this.inputfile = global new GlobalString("data/"+filename + mid);
+		this.inputfile = global new GlobalString("../data/"+filename + mid);
 	}
 
 
 	public void setInputFileName(String filename, int mid) {
 		this.mid = mid;
-		this.inputfile = global new GlobalString("data/"+filename + mid);
+		this.inputfile = global new GlobalString("../data/"+filename + mid);
 	}
 
 	public void init() {
@@ -138,6 +138,10 @@ public class FileSystem extends Thread {
 		}
 
     RecoveryStat.printRecoveryStat();
+
+
+    System.out.println("\n\n\n I'm done\n\n\n");
+
 	}
 
 	public void output() { 
diff --git a/Robust/src/Benchmarks/Recovery/FileSystem/dstm.conf b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/dstm.conf
similarity index 100%
rename from Robust/src/Benchmarks/Recovery/FileSystem/dstm.conf
rename to Robust/src/Benchmarks/Recovery/FileSystem/recovery/dstm.conf
diff --git a/Robust/src/Benchmarks/Recovery/FileSystem/recovery/makefile b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/makefile
new file mode 100644
index 00000000..fcf36839
--- /dev/null
+++ b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/makefile
@@ -0,0 +1,9 @@
+MAINCLASS=FileSystem
+SRC1=${MAINCLASS}.java 
+FLAGS= -recoverystats -dsm -dsmtask -recovery -nooptimize -mainclass ${MAINCLASS}
+default:
+	../../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC1}
+
+clean:
+	rm -rf tmpbuilddirectory
+	rm *.bin
diff --git a/Robust/src/Benchmarks/Recovery/MatrixMultiply/java/makefile b/Robust/src/Benchmarks/Recovery/MatrixMultiply/java/makefile
new file mode 100644
index 00000000..cf4e2e62
--- /dev/null
+++ b/Robust/src/Benchmarks/Recovery/MatrixMultiply/java/makefile
@@ -0,0 +1,9 @@
+MAINCLASS=MatrixMultiply
+SRC1=${MAINCLASS}.java
+FLAGS= -optimize -thread -mainclass ${MAINCLASS}
+default:
+	../../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC1}
+
+clean:
+	rm -rf tmpbuilddirectory
+	rm *.bin
diff --git a/Robust/src/Benchmarks/Recovery/MatrixMultiply/MatrixMultiply.java b/Robust/src/Benchmarks/Recovery/MatrixMultiply/recovery/MatrixMultiply.java
similarity index 98%
rename from Robust/src/Benchmarks/Recovery/MatrixMultiply/MatrixMultiply.java
rename to Robust/src/Benchmarks/Recovery/MatrixMultiply/recovery/MatrixMultiply.java
index 8d719c11..86bedf43 100644
--- a/Robust/src/Benchmarks/Recovery/MatrixMultiply/MatrixMultiply.java
+++ b/Robust/src/Benchmarks/Recovery/MatrixMultiply/recovery/MatrixMultiply.java
@@ -128,8 +128,8 @@ public class MatrixMultiply extends Task {
 
 		int[] mid = new int[8];
 		mid[0] = (128<<24)|(195<<16)|(180<<8)|21; //dw-2
-/*		mid[1] = (128<<24)|(195<<16)|(180<<8)|24; //dw-5
-		mid[2] = (128<<24)|(195<<16)|(180<<8)|26; //dw-7
+		mid[1] = (128<<24)|(195<<16)|(180<<8)|26; //dw-7
+/*		mid[2] = (128<<24)|(195<<16)|(180<<8)|26; //dw-7
 		mid[0] = (128<<24)|(195<<16)|(136<<8)|162; //dc1
 		mid[1] = (128<<24)|(195<<16)|(136<<8)|163; //dc2
 		mid[2] = (128<<24)|(195<<16)|(136<<8)|164; //dc3
diff --git a/Robust/src/Benchmarks/Recovery/MatrixMultiply/dstm.conf b/Robust/src/Benchmarks/Recovery/MatrixMultiply/recovery/dstm.conf
similarity index 91%
rename from Robust/src/Benchmarks/Recovery/MatrixMultiply/dstm.conf
rename to Robust/src/Benchmarks/Recovery/MatrixMultiply/recovery/dstm.conf
index 16efe08a..372ad1aa 100644
--- a/Robust/src/Benchmarks/Recovery/MatrixMultiply/dstm.conf
+++ b/Robust/src/Benchmarks/Recovery/MatrixMultiply/recovery/dstm.conf
@@ -1,4 +1,5 @@
 128.195.180.21
+128.195.180.26
 #128.195.136.162
 #128.195.136.163
 #128.195.136.164
diff --git a/Robust/src/Benchmarks/Recovery/MatrixMultiply/makefile b/Robust/src/Benchmarks/Recovery/MatrixMultiply/recovery/makefile
similarity index 77%
rename from Robust/src/Benchmarks/Recovery/MatrixMultiply/makefile
rename to Robust/src/Benchmarks/Recovery/MatrixMultiply/recovery/makefile
index 92d0677f..006b8647 100644
--- a/Robust/src/Benchmarks/Recovery/MatrixMultiply/makefile
+++ b/Robust/src/Benchmarks/Recovery/MatrixMultiply/recovery/makefile
@@ -4,7 +4,7 @@ SRC1=${MAINCLASS}.java
 FLAGS= -recovery -recoverystats -dsm -32bit -nooptimize -debug -dsmtask -mainclass ${MAINCLASS}
 
 default:
-	../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC1}
+	../../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC1}
 
 clean:
 	rm -rf tmpbuilddirectory
diff --git a/Robust/src/Benchmarks/Recovery/SpamFilter/BufferedReader.java b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/BufferedReader.java
similarity index 100%
rename from Robust/src/Benchmarks/Recovery/SpamFilter/BufferedReader.java
rename to Robust/src/Benchmarks/Recovery/SpamFilter/recovery/BufferedReader.java
diff --git a/Robust/src/Benchmarks/Recovery/SpamFilter/DistributedHashMap.java b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/DistributedHashMap.java
similarity index 100%
rename from Robust/src/Benchmarks/Recovery/SpamFilter/DistributedHashMap.java
rename to Robust/src/Benchmarks/Recovery/SpamFilter/recovery/DistributedHashMap.java
diff --git a/Robust/src/Benchmarks/Recovery/SpamFilter/EphemeralSignature.java b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/EphemeralSignature.java
similarity index 100%
rename from Robust/src/Benchmarks/Recovery/SpamFilter/EphemeralSignature.java
rename to Robust/src/Benchmarks/Recovery/SpamFilter/recovery/EphemeralSignature.java
diff --git a/Robust/src/Benchmarks/Recovery/SpamFilter/FilterResult.java b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/FilterResult.java
similarity index 100%
rename from Robust/src/Benchmarks/Recovery/SpamFilter/FilterResult.java
rename to Robust/src/Benchmarks/Recovery/SpamFilter/recovery/FilterResult.java
diff --git a/Robust/src/Benchmarks/Recovery/SpamFilter/FilterStatistic.java b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/FilterStatistic.java
similarity index 100%
rename from Robust/src/Benchmarks/Recovery/SpamFilter/FilterStatistic.java
rename to Robust/src/Benchmarks/Recovery/SpamFilter/recovery/FilterStatistic.java
diff --git a/Robust/src/Benchmarks/Recovery/SpamFilter/GString.java b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/GString.java
similarity index 100%
rename from Robust/src/Benchmarks/Recovery/SpamFilter/GString.java
rename to Robust/src/Benchmarks/Recovery/SpamFilter/recovery/GString.java
diff --git a/Robust/src/Benchmarks/Recovery/SpamFilter/HashEntry.java b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/HashEntry.java
similarity index 100%
rename from Robust/src/Benchmarks/Recovery/SpamFilter/HashEntry.java
rename to Robust/src/Benchmarks/Recovery/SpamFilter/recovery/HashEntry.java
diff --git a/Robust/src/Benchmarks/Recovery/SpamFilter/HashStat.java b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/HashStat.java
similarity index 100%
rename from Robust/src/Benchmarks/Recovery/SpamFilter/HashStat.java
rename to Robust/src/Benchmarks/Recovery/SpamFilter/recovery/HashStat.java
diff --git a/Robust/src/Benchmarks/Recovery/SpamFilter/MD5.java b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/MD5.java
similarity index 99%
rename from Robust/src/Benchmarks/Recovery/SpamFilter/MD5.java
rename to Robust/src/Benchmarks/Recovery/SpamFilter/recovery/MD5.java
index c21ef420..7b4b8b24 100644
--- a/Robust/src/Benchmarks/Recovery/SpamFilter/MD5.java
+++ b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/MD5.java
@@ -3,7 +3,7 @@
 // Manually translated by Jon Howell <jonh@cs.dartmouth.edu>
 // from some public domain C code (md5.c) included with the ssh-1.2.22 source.
 // Tue Jan 19 15:55:50 EST 1999
-// $Id: MD5.java,v 1.1 2010/01/31 10:04:47 jihoonl Exp $
+// $Id: MD5.java,v 1.1 2010/02/13 00:09:44 jihoonl Exp $
 //
 // To compute the message digest of a chunk of bytes, create an
 // MD5 object 'md5', call md5.update() as needed on buffers full
diff --git a/Robust/src/Benchmarks/Recovery/SpamFilter/Mail.java b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/Mail.java
similarity index 100%
rename from Robust/src/Benchmarks/Recovery/SpamFilter/Mail.java
rename to Robust/src/Benchmarks/Recovery/SpamFilter/recovery/Mail.java
diff --git a/Robust/src/Benchmarks/Recovery/SpamFilter/SignatureComputer.java b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/SignatureComputer.java
similarity index 100%
rename from Robust/src/Benchmarks/Recovery/SpamFilter/SignatureComputer.java
rename to Robust/src/Benchmarks/Recovery/SpamFilter/recovery/SignatureComputer.java
diff --git a/Robust/src/Benchmarks/Recovery/SpamFilter/SpamFilter.java b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/SpamFilter.java
similarity index 99%
rename from Robust/src/Benchmarks/Recovery/SpamFilter/SpamFilter.java
rename to Robust/src/Benchmarks/Recovery/SpamFilter/recovery/SpamFilter.java
index 6c2c0bf6..693c7e90 100644
--- a/Robust/src/Benchmarks/Recovery/SpamFilter/SpamFilter.java
+++ b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/SpamFilter.java
@@ -57,7 +57,7 @@ public class SpamFilter extends Thread {
 
         // randomly pick emails
         pickemail+=1;
-        Mail email = new Mail("emails/email"+pickemail);
+        Mail email = new Mail("../emails/email"+pickemail);
         Vector signatures = email.checkMail(thid);
 
         //check with global data structure
diff --git a/Robust/src/Benchmarks/Recovery/SpamFilter/WhiplashSignature.java b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/WhiplashSignature.java
similarity index 99%
rename from Robust/src/Benchmarks/Recovery/SpamFilter/WhiplashSignature.java
rename to Robust/src/Benchmarks/Recovery/SpamFilter/recovery/WhiplashSignature.java
index e0f98169..5f63bc88 100644
--- a/Robust/src/Benchmarks/Recovery/SpamFilter/WhiplashSignature.java
+++ b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/WhiplashSignature.java
@@ -19,7 +19,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
- $Id: WhiplashSignature.java,v 1.1 2010/01/31 10:04:47 jihoonl Exp $
+ $Id: WhiplashSignature.java,v 1.1 2010/02/13 00:09:44 jihoonl Exp $
  */
 public class WhiplashSignature {
   char[] b64table;
diff --git a/Robust/src/Benchmarks/Recovery/SpamFilter/dstm.conf b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/dstm.conf
similarity index 100%
rename from Robust/src/Benchmarks/Recovery/SpamFilter/dstm.conf
rename to Robust/src/Benchmarks/Recovery/SpamFilter/recovery/dstm.conf
diff --git a/Robust/src/Benchmarks/Recovery/SpamFilter/makefile b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/makefile
similarity index 88%
rename from Robust/src/Benchmarks/Recovery/SpamFilter/makefile
rename to Robust/src/Benchmarks/Recovery/SpamFilter/recovery/makefile
index 5b8d579c..569af6c1 100644
--- a/Robust/src/Benchmarks/Recovery/SpamFilter/makefile
+++ b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/makefile
@@ -14,7 +14,7 @@ SRC=${MAINCLASS}.java \
 FLAGS= -dsm -recoverystats -recovery -nooptimize -mainclass ${MAINCLASS}
 
 default:
-	../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC}
+	../../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC}
 
 clean:
 	rm -rf tmpbuilddirectory*
diff --git a/Robust/src/Benchmarks/Recovery/Spider/java/makefile b/Robust/src/Benchmarks/Recovery/Spider/java/makefile
index 6c43c3d6..cff29434 100644
--- a/Robust/src/Benchmarks/Recovery/Spider/java/makefile
+++ b/Robust/src/Benchmarks/Recovery/Spider/java/makefile
@@ -3,7 +3,7 @@ SUBCLASS=Query
 SRC1=${MAINCLASS}.java
 SRC2=Local${SUBCLASS}.java
 SRC3=${SUBCLASS}Task.java
-FLAGS= -32bit -nooptimize -mainclass ${MAINCLASS}
+FLAGS= -optimize -thread -mainclass ${MAINCLASS}
 default:
 	../../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC2} ${SRC3} ${SRC1}
 
diff --git a/Robust/src/Benchmarks/Recovery/Spider/makefile b/Robust/src/Benchmarks/Recovery/Spider/makefile
deleted file mode 100644
index 3702f861..00000000
--- a/Robust/src/Benchmarks/Recovery/Spider/makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-MAINCLASS=Spider
-SUBCLASS=Query
-SRC1=${MAINCLASS}.java
-SRC2=Global${SUBCLASS}.java
-SRC3=${SUBCLASS}Task.java
-FLAGS= -recoverystats -recovery -dsmtask -dsm -dsmtask -32bit -nooptimize -debug -mainclass ${MAINCLASS}
-default:
-	../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC2} ${SRC3} ${SRC1}
-
-clean:
-	rm -rf tmpbuilddirectory
-	rm *.bin
diff --git a/Robust/src/Benchmarks/Recovery/Spider/GlobalQuery.java b/Robust/src/Benchmarks/Recovery/Spider/recovery/GlobalQuery.java
similarity index 100%
rename from Robust/src/Benchmarks/Recovery/Spider/GlobalQuery.java
rename to Robust/src/Benchmarks/Recovery/Spider/recovery/GlobalQuery.java
diff --git a/Robust/src/Benchmarks/Recovery/Spider/LocalQuery.java b/Robust/src/Benchmarks/Recovery/Spider/recovery/LocalQuery.java
similarity index 100%
rename from Robust/src/Benchmarks/Recovery/Spider/LocalQuery.java
rename to Robust/src/Benchmarks/Recovery/Spider/recovery/LocalQuery.java
diff --git a/Robust/src/Benchmarks/Recovery/Spider/QueryTask.java b/Robust/src/Benchmarks/Recovery/Spider/recovery/QueryTask.java
similarity index 100%
rename from Robust/src/Benchmarks/Recovery/Spider/QueryTask.java
rename to Robust/src/Benchmarks/Recovery/Spider/recovery/QueryTask.java
diff --git a/Robust/src/Benchmarks/Recovery/Spider/Spider.java b/Robust/src/Benchmarks/Recovery/Spider/recovery/Spider.java
similarity index 95%
rename from Robust/src/Benchmarks/Recovery/Spider/Spider.java
rename to Robust/src/Benchmarks/Recovery/Spider/recovery/Spider.java
index 93242493..77771683 100644
--- a/Robust/src/Benchmarks/Recovery/Spider/Spider.java
+++ b/Robust/src/Benchmarks/Recovery/Spider/recovery/Spider.java
@@ -33,7 +33,9 @@ public class Spider {
 		int mid[] = new int[8];
 		mid[0] = (128<<24)|(195<<16)|(180<<8)|21;
 		mid[1] = (128<<24)|(195<<16)|(180<<8)|26;
-/*		mid[0] = (128<<24)|(195<<16)|(136<<8)|162;
+		mid[2] = (128<<24)|(195<<16)|(180<<8)|24;
+/*    
+		mid[0] = (128<<24)|(195<<16)|(136<<8)|162;
 		mid[1] = (128<<24)|(195<<16)|(136<<8)|163;
 		mid[2] = (128<<24)|(195<<16)|(136<<8)|164;
 		mid[3] = (128<<24)|(195<<16)|(136<<8)|165;
@@ -41,7 +43,7 @@ public class Spider {
 		mid[5] = (128<<24)|(195<<16)|(136<<8)|167;
 		mid[6] = (128<<24)|(195<<16)|(136<<8)|168;
 		mid[7] = (128<<24)|(195<<16)|(136<<8)|169;
-  */  
+  */
 		atomic {
 			firstmachine = global new GlobalString(fm);
 			if (args.length == 3) {
diff --git a/Robust/src/Benchmarks/Recovery/Spider/dstm.conf b/Robust/src/Benchmarks/Recovery/Spider/recovery/dstm.conf
similarity index 100%
rename from Robust/src/Benchmarks/Recovery/Spider/dstm.conf
rename to Robust/src/Benchmarks/Recovery/Spider/recovery/dstm.conf
index 28d63559..6deb6935 100644
--- a/Robust/src/Benchmarks/Recovery/Spider/dstm.conf
+++ b/Robust/src/Benchmarks/Recovery/Spider/recovery/dstm.conf
@@ -1,6 +1,6 @@
 128.195.180.21
-#128.195.180.24
 128.195.180.26
+#128.195.180.24
 #128.195.136.162
 #128.195.136.163
 #128.195.136.164
diff --git a/Robust/src/Benchmarks/Recovery/Spider/recovery/makefile b/Robust/src/Benchmarks/Recovery/Spider/recovery/makefile
new file mode 100644
index 00000000..2bb9fd45
--- /dev/null
+++ b/Robust/src/Benchmarks/Recovery/Spider/recovery/makefile
@@ -0,0 +1,12 @@
+MAINCLASS=Spider
+SUBCLASS=Query
+SRC1=${MAINCLASS}.java
+SRC2=Global${SUBCLASS}.java
+SRC3=${SUBCLASS}Task.java
+FLAGS= -recoverystats -recovery -dsm -dsmtask -32bit -nooptimize -debug -mainclass ${MAINCLASS}
+default:
+	../../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC2} ${SRC3} ${SRC1}
+
+clean:
+	rm -rf tmpbuilddirectory
+	rm *.bin
diff --git a/Robust/src/Benchmarks/Recovery/bm_args.txt b/Robust/src/Benchmarks/Recovery/bm_args.txt
index 3aa95998..36796d88 100644
--- a/Robust/src/Benchmarks/Recovery/bm_args.txt
+++ b/Robust/src/Benchmarks/Recovery/bm_args.txt
@@ -1 +1 @@
-FileSystem:data
+Spider:"www.uci.edu" "" 5
diff --git a/Robust/src/Benchmarks/Recovery/runjava.sh b/Robust/src/Benchmarks/Recovery/runjava.sh
index d5e22949..7adb5eaa 100755
--- a/Robust/src/Benchmarks/Recovery/runjava.sh
+++ b/Robust/src/Benchmarks/Recovery/runjava.sh
@@ -1,5 +1,7 @@
 # !/bin/sh
 BASEDIR=`pwd`
+RECOVERYDIR='recovery'
+JAVASINGLEDIR='java'
 ITERATIONS=10
 WAITTIME=300
 
@@ -31,9 +33,9 @@ function runMachines {
   let "k= $NUM_MACHINE"
   
   echo ${BASEDIR}/${BM_DIR} > ~/.tmpdir
-  DIR=`echo ${BASEDIR}\/${BM_DIR}`;
+  DIR=`echo ${BASEDIR}\/${BM_DIR}\/${RECOVERYDIR}`;
   echo "DIR = $DIR";
-  
+ 
   # Run machines
   while [ $k -gt 1 ]; do
     echo "SSH into dc-${k}"
-- 
2.34.1