From: adash Date: Wed, 18 May 2011 20:09:21 +0000 (+0000) Subject: new changes X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b4051145f83011154e28e7eabc68871c64b62718;p=IRC.git new changes --- diff --git a/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java index d98bc43f..c17140e8 100644 --- a/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java +++ b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java @@ -37,7 +37,7 @@ public class FileSystem extends Thread { char ptr[]=new char[1024]; //for(int i=0;i<40000;i++) { for(int i=0;i<15000;i++) { - System.out.println("i= " + i + "\n"); + //System.out.println("i= " + i + "\n"); atomic { for(int count=0;count<10;count++) { int value=r.nextInt(100); diff --git a/Robust/src/Benchmarks/Recovery/MatrixMultiply/recovery/MatrixMultiply.java b/Robust/src/Benchmarks/Recovery/MatrixMultiply/recovery/MatrixMultiply.java index d763c1af..32fa019d 100644 --- a/Robust/src/Benchmarks/Recovery/MatrixMultiply/recovery/MatrixMultiply.java +++ b/Robust/src/Benchmarks/Recovery/MatrixMultiply/recovery/MatrixMultiply.java @@ -98,7 +98,9 @@ public class MatrixMultiply extends Task { System.exit(0); } - int[] mid = new int[16]; + //int[] mid = new int[16]; + int[] mid = new int[8]; + /* mid[0] = (128<<24)|(195<<16)|(136<<8)|162; //dc1 mid[1] = (128<<24)|(195<<16)|(136<<8)|162; //dc1 mid[2] = (128<<24)|(195<<16)|(136<<8)|163; //dc2 @@ -115,7 +117,16 @@ public class MatrixMultiply extends Task { mid[13] = (128<<24)|(195<<16)|(136<<8)|168; //dc7 mid[14] = (128<<24)|(195<<16)|(136<<8)|169; //dc8 mid[15] = (128<<24)|(195<<16)|(136<<8)|169; //dc8 + */ + mid[0] = (128<<24)|(195<<16)|(136<<8)|162; //dc1 + mid[1] = (128<<24)|(195<<16)|(136<<8)|163; //dc2 + mid[2] = (128<<24)|(195<<16)|(136<<8)|164; //dc3 + mid[3] = (128<<24)|(195<<16)|(136<<8)|165; //dc4 + mid[4] = (128<<24)|(195<<16)|(136<<8)|166; //dc5 + mid[5] = (128<<24)|(195<<16)|(136<<8)|167; //dc6 + mid[6] = (128<<24)|(195<<16)|(136<<8)|168; //dc7 + mid[7] = (128<<24)|(195<<16)|(136<<8)|169; //dc8 atomic { //System.out.println("atomic 1"); diff --git a/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/dstm.conf b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/dstm.conf index 1a08f02b..cbce2d59 100644 --- a/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/dstm.conf +++ b/Robust/src/Benchmarks/Recovery/SpamFilter/recovery/dstm.conf @@ -2,3 +2,7 @@ 128.195.136.163 128.195.136.164 128.195.136.165 +128.195.136.166 +128.195.136.167 +128.195.136.168 +128.195.136.169 diff --git a/Robust/src/Benchmarks/Recovery/bm_args.txt b/Robust/src/Benchmarks/Recovery/bm_args.txt index 7d64dfe7..75fe2cf9 100644 --- a/Robust/src/Benchmarks/Recovery/bm_args.txt +++ b/Robust/src/Benchmarks/Recovery/bm_args.txt @@ -1,5 +1,5 @@ -testcase 8 MatrixMultiply:2048 80 -testcase 8 Spider:"dc-11.calit2.uci.edu" 10 +#testcase 8 MatrixMultiply:2048 80 +#testcase 8 Spider:"dc-11.calit2.uci.edu" 10 testcase 8 FileSystem: -testcase 8 SpamFilter:-e 500 -n 10 -testcase 8 Game: +#testcase 8 SpamFilter:-e 500 -n 10 +#testcase 8 Game: diff --git a/Robust/src/Benchmarks/Recovery/runjava.sh b/Robust/src/Benchmarks/Recovery/runjava.sh index 2692a77b..8f5604cc 100755 --- a/Robust/src/Benchmarks/Recovery/runjava.sh +++ b/Robust/src/Benchmarks/Recovery/runjava.sh @@ -11,7 +11,7 @@ BASEDIR=`pwd` RECOVERYDIR='recovery' JAVASINGLEDIR='java' WAITTIME=120 -KILLDELAY=15 +KILLDELAY=10 LOGDIR=~/research/Robust/src/Benchmarks/Recovery/runlog DSTMDIR=${HOME}/research/Robust/src/Benchmarks/Prefetch/config MACHINELIST='dc-1.calit2.uci.edu dc-2.calit2.uci.edu dc-3.calit2.uci.edu dc-4.calit2.uci.edu dc-5.calit2.uci.edu dc-6.calit2.uci.edu dc-7.calit2.uci.edu dc-8.calit2.uci.edu' @@ -25,9 +25,10 @@ ORDER=( 0 1 3 5 7 8 2 0 1 2 3 4 5 6 0 1 8 4 6 3 7 0 8 7 3 6 5 4 - 0 7 4 6 8 1 2 ); + 0 7 4 6 8 1 2 + 0 7 5 6 3 8 2 ); -#ORDER=( 0 1 8 4 6 3 7 ); +#ORDER=( 0 7 5 6 3 8 2 ); # # killClients <# of machines> @@ -68,6 +69,9 @@ function runMachines { # Start machines echo "Running machines" let "k= $NUM_MACHINE" + if [ $k == 16 ]; then + k=8; + fi DIR=`echo ${BASEDIR}\/${BM_DIR}\/${RECOVERYDIR}`; echo "DIR = $DIR"; @@ -114,7 +118,7 @@ function runNormalTest { } ########### Sequential Failure case ########## -function runFailureTest { +function runSequentialFailureTest { # Run java version # j=1; BM_DIR=${BM_NAME} @@ -151,7 +155,7 @@ function runFailureTest { echo "------------------------ dc-$k is killed ------------------------" killonemachine $fName $k - let "delay= $RANDOM % $KILLDELAY + 4" + let "delay= $RANDOM % $KILLDELAY + 15" sleep $delay fi done @@ -173,7 +177,7 @@ function runSingleFailureTest { #ORDER=( 0 1 8 4 6 3 7 ); #SINGLE_ORDER=( 1 8 4 6 3 2 7 5 ); - SINGLE_ORDER=( 8 4 ); + SINGLE_ORDER=( 8 ); for machinename in ${SINGLE_ORDER[@]} @@ -343,14 +347,14 @@ function testcase { # runNormalTest $NUM_MACHINES 1 # echo "================================================================================" -# echo "====================================== Failure Test =============================" -# runFailureTest $NUM_MACHINES -# echo "=================================================================================" - - echo "====================================== Single Failure Test =============================" - runSingleFailureTest $NUM_MACHINES + echo "====================================== Failure Test =============================" + runSequentialFailureTest $NUM_MACHINES echo "=================================================================================" +# echo "====================================== Single Failure Test =============================" +# runSingleFailureTest $NUM_MACHINES +# echo "=================================================================================" + # echo "=============== Running javasingle for ${BM_NAME} on 1 machines =================" # javasingle 1 ${BM_NAME} # cd $TOPDIR