changes

diff --git a/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java
index 180d35b21d26a0de82bf7f2361f622bd4238f3d8..9506901c7e1fc5d7a92fa17119f2f5a945a1af13 100644 (file)
--- a/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java
+++ b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java
@@ -279,14 +279,8 @@ public class FileSystem extends Thread {
        */\r
                FileSystem[] lus;\r
                FileSystem initLus;\r
-\r
-               Work[] works;\r
-               Transaction[] currentWorkList;          // type might be something else\r
                \r
                atomic {\r
-                       currentWorkList = global new Transaction[NUM_THREADS];          // something else\r
-                       works = global new Work[NUM_THREADS];\r
-                       \r
                        DistributedHashMap fs = global new DistributedHashMap(500, 500, 0.75f);\r
                        DistributedHashMap dir = global new DistributedHashMap(500, 500, 0.75f);\r
                        DistributedLinkedList dir_list = global new DistributedLinkedList();\r
@@ -296,8 +290,6 @@ public class FileSystem extends Thread {
 \r
                        lus = global new FileSystem[NUM_THREADS];\r
                        for(int i = 0; i < NUM_THREADS; i++) {\r
-//                             lus[i] = initLus;\r
-//                             lus[i].setInputFileName(filename, i);\r
                                lus[i] = global new FileSystem(initLus.dir, initLus.fs, initLus.dir_list, filename, i);\r
                        }\r
                }\r

diff --git a/Robust/src/Benchmarks/Recovery/FileSystem/recovery/makefile b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/makefile
index fcf368390928e4adef13299a772013bf4e17f07d..cf672af43f18268376cedb76b62d48e469189188 100644 (file)
--- a/Robust/src/Benchmarks/Recovery/FileSystem/recovery/makefile
+++ b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/makefile
@@ -1,6 +1,6 @@
 MAINCLASS=FileSystem
 SRC1=${MAINCLASS}.java 
-FLAGS= -recoverystats -dsm -dsmtask -recovery -nooptimize -mainclass ${MAINCLASS}
+FLAGS= -recoverystats -dsm -recovery -nooptimize -mainclass ${MAINCLASS}
 default:
        ../../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC1}
 

diff --git a/Robust/src/Benchmarks/Recovery/Spider/recovery/makefile b/Robust/src/Benchmarks/Recovery/Spider/recovery/makefile
index 2bb9fd45b202252ccb248f8173ad078777d8cfeb..cf6391fc6b5b65517f6c40775b51fc59894154e9 100644 (file)
--- a/Robust/src/Benchmarks/Recovery/Spider/recovery/makefile
+++ b/Robust/src/Benchmarks/Recovery/Spider/recovery/makefile
@@ -3,7 +3,7 @@ SUBCLASS=Query
 SRC1=${MAINCLASS}.java
 SRC2=Global${SUBCLASS}.java
 SRC3=${SUBCLASS}Task.java
-FLAGS= -recoverystats -recovery -dsm -dsmtask -32bit -nooptimize -debug -mainclass ${MAINCLASS}
+FLAGS= -recoverystats -recovery -dsm -dsmtask -nooptimize -mainclass ${MAINCLASS}
 default:
        ../../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC2} ${SRC3} ${SRC1}