command line parsing change for the script

diff --git a/Robust/src/Benchmarks/Recovery/Game/README b/Robust/src/Benchmarks/Recovery/Game/README
index 0eecfb89ec7584e0e8b0c13891ad937f42c09753..8607f34bd904ae97d7655364a6d258fb1964cbf2 100644 (file)
--- a/Robust/src/Benchmarks/Recovery/Game/README
+++ b/Robust/src/Benchmarks/Recovery/Game/README
@@ -7,7 +7,7 @@
 
 compile: make
 
-run usage: ./Game.bin -N <number of threads>
+run usage: ./Game.bin <number of threads>
 
 # recovery directory has the source code for a multi threaded execution with
 # enabled
@@ -17,5 +17,5 @@ Building and running recovery version
 
 compile: make
 
-run usage: ./Game.bin master -N <number of threads> (on master machine)
+run usage: ./Game.bin master <number of threads> (on master machine)
           and  ./Game.bin (on slaves)

diff --git a/Robust/src/Benchmarks/Recovery/Game/java/RainForest.java b/Robust/src/Benchmarks/Recovery/Game/java/RainForest.java
index d600cfa477919efdf6629cec86b7409b8b961020..2c9fa2639625b4a48ae1082a8c43a35e9082e720 100644 (file)
--- a/Robust/src/Benchmarks/Recovery/Game/java/RainForest.java
+++ b/Robust/src/Benchmarks/Recovery/Game/java/RainForest.java
@@ -269,15 +269,12 @@ public class RainForest extends Thread {
    **/
   public static void parseCmdLine(String args[], RainForest rf) {
     int i = 0;
+    rf.numThreads = new Integer(args[0]).intValue();
     String arg;
     while(i < args.length && args[i].startsWith("-")) {
       arg = args[i++];
       //check options
-      if(arg.equals("-N")) {
-        if(i < args.length) {
-          rf.numThreads = new Integer(args[i++]).intValue();
-        }
-      } else if(arg.equals("-h")) {
+      if(arg.equals("-h")) {
         rf.usage();
       }
     }

diff --git a/Robust/src/Benchmarks/Recovery/Game/recovery/RainForest.java b/Robust/src/Benchmarks/Recovery/Game/recovery/RainForest.java
index 79df0e923985ea07a684c8d92467e4d33b5e8de4..3aade1d82226465446f6c17153024953d40f2254 100644 (file)
--- a/Robust/src/Benchmarks/Recovery/Game/recovery/RainForest.java
+++ b/Robust/src/Benchmarks/Recovery/Game/recovery/RainForest.java
@@ -276,15 +276,12 @@ public class RainForest extends Thread {
    **/
   public static void parseCmdLine(String args[], RainForest rf) {
     int i = 0;
+    rf.numThreads = new Integer(args[0]).intValue();
     String arg;
     while(i < args.length && args[i].startsWith("-")) {
       arg = args[i++];
       //check options
-      if(arg.equals("-N")) {
-        if(i < args.length) {
-          rf.numThreads = new Integer(args[i++]).intValue();
-        }
-      } else if(arg.equals("-h")) {
+      if(arg.equals("-h")) {
         rf.usage();
       }
     }

diff --git a/Robust/src/Benchmarks/Recovery/Game/recovery/makefile b/Robust/src/Benchmarks/Recovery/Game/recovery/makefile
index ef57b7e16ba7901944d244900fb4299c406abbff..3b9771b42a5cc877057374f09736bd9c6bd41c4d 100644 (file)
--- a/Robust/src/Benchmarks/Recovery/Game/recovery/makefile
+++ b/Robust/src/Benchmarks/Recovery/Game/recovery/makefile
@@ -11,7 +11,7 @@ SRC=tmp${MAINCLASS}.java \
        AStarPathFinder.java \
     ../../../../ClassLibrary/JavaDSM/Thread.java
     
-FLAGS1=-dsm -recoverystats -recovery -debug -nooptimize -mainclass ${MAINCLASS}
+FLAGS1=-dsm -recoverystats -recovery -optimize -mainclass ${MAINCLASS}
 
 default:
        cpp ${MAINCLASS}.java > tmp1${MAINCLASS}.java