From: jihoonl Date: Wed, 17 Feb 2010 00:14:12 +0000 (+0000) Subject: changes X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=41dd0d0f976f273cfa86d1ca2dcdb5572aea1f75;p=IRC.git changes --- diff --git a/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java index 180d35b2..9506901c 100644 --- 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 { */ FileSystem[] lus; FileSystem initLus; - - Work[] works; - Transaction[] currentWorkList; // type might be something else atomic { - currentWorkList = global new Transaction[NUM_THREADS]; // something else - works = global new Work[NUM_THREADS]; - DistributedHashMap fs = global new DistributedHashMap(500, 500, 0.75f); DistributedHashMap dir = global new DistributedHashMap(500, 500, 0.75f); DistributedLinkedList dir_list = global new DistributedLinkedList(); @@ -296,8 +290,6 @@ public class FileSystem extends Thread { lus = global new FileSystem[NUM_THREADS]; for(int i = 0; i < NUM_THREADS; i++) { -// lus[i] = initLus; -// lus[i].setInputFileName(filename, i); lus[i] = global new FileSystem(initLus.dir, initLus.fs, initLus.dir_list, filename, i); } } diff --git a/Robust/src/Benchmarks/Recovery/FileSystem/recovery/makefile b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/makefile index fcf36839..cf672af4 100644 --- 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 2bb9fd45..cf6391fc 100644 --- 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}