changes

diff --git a/Robust/src/Benchmarks/Recovery/MatrixMultiply/MatrixMultiplyN.java b/Robust/src/Benchmarks/Recovery/MatrixMultiply/MatrixMultiplyN.java
index f4b8d871af4b19b81137466765e2485244026d86..fdc24eba892d5b352b5691af7c8d60bb7f6d790b 100644 (file)
--- a/Robust/src/Benchmarks/Recovery/MatrixMultiply/MatrixMultiplyN.java
+++ b/Robust/src/Benchmarks/Recovery/MatrixMultiply/MatrixMultiplyN.java
@@ -61,10 +61,10 @@ public class MatrixMultiply extends Task {
     }
 
                lc = new double[size][size];
-               System.out.println("Seg x0 = " + x0 + " - x1 = " + x1);
+//             System.out.println("Seg x0 = " + x0 + " - x1 = " + x1);
                
                for(i = x0; i < x1 ; i++) {
-                       System.printString("i = " + i + "\n");
+//                     System.printString("i = " + i + "\n");
                  atomic {
         rowA = la[i];   // grab first mat's row
 

diff --git a/Robust/src/Benchmarks/Recovery/MatrixMultiply/makefile b/Robust/src/Benchmarks/Recovery/MatrixMultiply/makefile
index b78e006cd2a9471786d9ed4885a648c19f4bdc60..cb8d03bd3cc3c8b0b407868186913257deb3f823 100644 (file)
--- a/Robust/src/Benchmarks/Recovery/MatrixMultiply/makefile
+++ b/Robust/src/Benchmarks/Recovery/MatrixMultiply/makefile
@@ -1,7 +1,7 @@
 MAINCLASS=MatrixMultiply
 SRC1=${MAINCLASS}N.java         
 
-FLAGS= -recovery -dsm -32bit -nooptimize -recovery -debug -dsmtask -mainclass ${MAINCLASS}
+FLAGS= -recovery -recoverystats -dsm -32bit -nooptimize -debug -dsmtask -mainclass ${MAINCLASS}
 
 default:
        ../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC1}

diff --git a/Robust/src/Benchmarks/Recovery/Spider/Spider.java b/Robust/src/Benchmarks/Recovery/Spider/Spider.java
index 27a7827f31781089fb93629211a3de9caf8bc5bd..dd2865665fc83b943fbd6e50cbb9fbda533d46f8 100644 (file)
--- a/Robust/src/Benchmarks/Recovery/Spider/Spider.java
+++ b/Robust/src/Benchmarks/Recovery/Spider/Spider.java
@@ -2,7 +2,7 @@ public class Spider {
        public static void main(String[] args) {
                int NUM_THREADS = 3;
                int maxDepth = 4;
-               int maxSearchDepth = 10;
+               int maxSearchDepth = 100;
                int i, j;
                Work[] works;
                QueryTask[] qt;
@@ -13,11 +13,17 @@ public class Spider {
                GlobalString firstmachine;
                GlobalString firstpage;
 
-               int mid[] = new int[NUM_THREADS];
-               mid[0] = (128<<24)|(195<<16)|(180<<8)|21;
+               int mid[] = new int[8];
+               mid[0] = (128<<24)|(195<<16)|(136<<8)|162;
+               mid[1] = (128<<24)|(195<<16)|(136<<8)|163;
+               mid[2] = (128<<24)|(195<<16)|(136<<8)|164;
+               mid[3] = (128<<24)|(195<<16)|(136<<8)|165;
+    
+
+/*             mid[0] = (128<<24)|(195<<16)|(180<<8)|21;
                mid[1] = (128<<24)|(195<<16)|(180<<8)|24;
                mid[2] = (128<<24)|(195<<16)|(180<<8)|26;
-
+*/
                atomic {
                        firstmachine = global new GlobalString(args[1]);
                        if (args.length == 3) {

diff --git a/Robust/src/Benchmarks/Recovery/Spider/dstm.conf b/Robust/src/Benchmarks/Recovery/Spider/dstm.conf
index da5d354d92cca00fdd99b7627eb106b2346c5695..eff447b84ee46f8283d2f55e0e45f4c543ef1333 100644 (file)
--- a/Robust/src/Benchmarks/Recovery/Spider/dstm.conf
+++ b/Robust/src/Benchmarks/Recovery/Spider/dstm.conf
@@ -1,6 +1,6 @@
-128.195.180.21
-128.195.180.24
-128.195.180.26
-#128.195.136.162
-#128.195.136.163
-#128.195.136.164
+#128.195.180.21
+#128.195.180.24
+#128.195.180.26
+128.195.136.162
+128.195.136.163
+128.195.136.164

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

diff --git a/Robust/src/Benchmarks/Recovery/runjava.sh b/Robust/src/Benchmarks/Recovery/runjava.sh
new file mode 100755 (executable)
index 0000000..4d197cc
--- /dev/null
+++ b/Robust/src/Benchmarks/Recovery/runjava.sh
@@ -0,0 +1,90 @@
+# !/bin/sh
+BASEDIR=`pwd`
+LOGDIR=${BASEDIR}
+DSTM_CONFDIR=${HOME}/research/Robust/src
+JAVA_DIR=java
+JVM_DIR=jvm
+DSM_DIR=dsm
+ITERATIONS=1
+
+function killclients {
+  i=1;
+  let "k= $NUM_MACHINE";
+  while [ $i -le $k ]; do
+    echo "killing dc-$i"
+    ssh dc-${i} pkill -u jihoonl -f MatrixMultiply.bin
+    i=`expr $i + 1`
+  done
+}
+
+function runjava {
+# Run java version
+  echo "Runnning ${BM_NAME}"
+  j=1;
+  BM_DIR=${BM_NAME}
+
+  cd ${BM_DIR}    
+
+  while [ $j -le $ITERATIONS ]; do
+    echo "Running on ${NUM_MACHINE} machines ... "
+
+    # Start machines
+    echo "Running machines"
+    let "k= $NUM_MACHINE"
+
+    echo ${BASEDIR}/${BM_DIR} > ~/.tmpdir
+    DIR=`echo ${BASEDIR}\/${BM_DIR}`;
+    echo "DIR = $DIR";
+
+    while [ $k -gt 1 ]; do
+      echo "SSH into dc-${k}"
+      echo "ssh dc-${k} 'cd' $DIR'; ./$BM_NAME.bin'"
+      ssh dc-${k} 'cd '$DIR'; ./'$BM_NAME'.bin' &
+      k=`expr $k - 1`
+    done
+    echo "Running master machine ... "
+    echo "ssh dc-1 'cd '$DIR'; ./$BM_NAME.bin master $NUM_MACHINE $BM_ARGS"
+    ssh dc-1 'cd '$DIR'; ./'$BM_NAME'.bin master '$NUM_MACHINE $BM_ARGS
+
+    sleep 1 ;
+    j=`expr $j + 1`
+  done
+  cd -
+}
+
+echo "---------- Starting Benchmarks ----------"
+exec < bm_args.txt
+while read line
+do
+  BM_NAME=`echo $line | cut -f1 -d":"`
+  BM_ARGS=`echo $line | cut -f2 -d":"`
+
+  # Setup for remote machine
+  echo "" > ~/.bmargs
+  echo "BM_NAME='$BM_NAME'" > ~/.bmargs
+  echo "BM_ARGS='$BM_ARGS'" > ~/.bmargs
+
+  let "NUM_MACHINE= $1 + 0";
+
+  if [ $NUM_MACHINE -eq 0 ];
+  then
+    echo "Wrong input.. ./runjava.sh <num_machine>"
+    exit 0
+  fi
+
+  echo "BM_NAME= $BM_NAME"
+  echo "BM_ARGS= $BM_ARGS"
+  echo "NUM_M = $NUM_MACHINE"
+  runjava $NUM_MACHINES
+  
+  echo "done run"
+
+  killclients
+
+  # Clean up
+  rm ~/.bmargs
+  rm ~/.tmpdir
+done
+
+echo "----------- done ------------"
+