From 0ee6e326cadbf6270584a1219560a95c720b51e3 Mon Sep 17 00:00:00 2001 From: adash <adash> Date: Tue, 13 Apr 2010 01:40:18 +0000 Subject: [PATCH] my changes --- Robust/src/Benchmarks/Recovery/Game/recovery/Barrier.java | 4 ++-- .../src/Benchmarks/Recovery/Game/recovery/RainForest.java | 4 ++-- Robust/src/Benchmarks/Recovery/Game/recovery/makefile | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Robust/src/Benchmarks/Recovery/Game/recovery/Barrier.java b/Robust/src/Benchmarks/Recovery/Game/recovery/Barrier.java index ec63d471..fc9de580 100644 --- 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 fb8b7ce6..8924ebd8 100644 --- 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 7958db59..c9bfc70e 100644 --- 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 -- 2.34.1