my changes

diff --git a/Robust/src/Benchmarks/Recovery/Game/recovery/Barrier.java b/Robust/src/Benchmarks/Recovery/Game/recovery/Barrier.java
index ec63d471994dd4c9ce760fa8754153a153ff1095..fc9de5804eeacc86b057c0f20ccf8b68154f395f 100644 (file)
--- a/Robust/src/Benchmarks/Recovery/Game/recovery/Barrier.java
+++ b/Robust/src/Benchmarks/Recovery/Game/recovery/Barrier.java
@@ -67,9 +67,9 @@ public class Barrier extends Thread {
           y=tinfo[i].counter;
         }
 
-        //System.out.println("i= " + i + " i's count= " + y + " threadid= " + threadid + " mycount= " + x);
+        //System.printString("i= " + i + " i's count= " + y + " threadid= " + threadid + " mycount= " + x);
 
-        while(y!=x && (Thread.getStatus(i) != -1)) {
+        while(y<x && (Thread.getStatus(i) != -1)) {
           //Wait for 100 microseconds
           sleep(100);
           atomic {

diff --git a/Robust/src/Benchmarks/Recovery/Game/recovery/RainForest.java b/Robust/src/Benchmarks/Recovery/Game/recovery/RainForest.java
index fb8b7ce60bc012b262eadac3c283f374d21971d7..8924ebd858f8faeabb752652afe31aaea63926fc 100644 (file)
--- a/Robust/src/Benchmarks/Recovery/Game/recovery/RainForest.java
+++ b/Robust/src/Benchmarks/Recovery/Game/recovery/RainForest.java
@@ -85,7 +85,7 @@ public class RainForest extends Thread {
     //Do N rounds 
     //do one move per round and synchronise
     for(int i = 0; i<ROUNDS; i++) {
-//      System.out.println("iteration= " + i);
+      //System.out.println("iteration= " + i);
       atomic {
         doOneMove(land, gamer);
       }
@@ -99,7 +99,7 @@ public class RainForest extends Thread {
     }
 
     fi = System.currentTimeMillis();
-    System.out.println("\n\n\n I'm Done - Time Elapse : " + (double)((fi-st)/1000) +"\n\n\n");
+    System.printString("\n\n\n I'm Done - Time Elapse : " + (double)((fi-st)/1000) +"\n\n\n");
     
     RecoveryStat.printRecoveryStat();
     while(true) {

diff --git a/Robust/src/Benchmarks/Recovery/Game/recovery/makefile b/Robust/src/Benchmarks/Recovery/Game/recovery/makefile
index 7958db59436dc73425920af6389ad39ca978ffcb..c9bfc70eaefbab987e58f3718c6645c461626998 100644 (file)
--- a/Robust/src/Benchmarks/Recovery/Game/recovery/makefile
+++ b/Robust/src/Benchmarks/Recovery/Game/recovery/makefile
@@ -8,16 +8,16 @@ SRC=tmp${MAINCLASS}.java \
        Goal.java \
        Path.java \
        Node.java \
-       AStarPathFinder.java \
-    ../../../../ClassLibrary/JavaDSM/Thread.java
+       AStarPathFinder.java 
     
-FLAGS1=-dsm -dsmcaching -recoverystats -recovery -optimize -mainclass ${MAINCLASS}
-DSMFLAGS=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS}
+FLAGS1=-dsm -dsmcaching -recoverystats -recovery -transstats -optimize -mainclass ${MAINCLASS}
+DSMFLAGS=-dsm -dsmcaching -transstats -optimize -mainclass ${MAINCLASS}
 
 default:
        cpp ${MAINCLASS}.java > tmp1${MAINCLASS}.java
        ./extractLines
        ../../../../buildscript ${FLAGS1} -o Game ${SRC}
+       ../../../../buildscript ${DSMFLAGS} -o GameDSM ${SRC}
 
 clean:
        rm tmp1RainForest.java