check in all changes to the benchmarks for the pldi2009 paper

diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
index 0f1fbbc269fc4d5591bd3e48df2d05bdc4f9d7db..d04cbe19e12d5f4957c06594592edf58118ca43f 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
+++ b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
@@ -59,7 +59,6 @@ public class Em3d extends Thread {
     Barrier barr;
     int degree;
     Random random;
-    String hname;
 
     barr = new Barrier("128.195.175.84");
     atomic {

diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/javasingle/makefile b/Robust/src/Benchmarks/Prefetch/Em3d/javasingle/makefile
index 9242ab44cee76a5059b5b3e410ac9ae067ce9c69..2d1b5b4c2ad1dcf16e699453305d6c6c1e53ac5f 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Em3d/javasingle/makefile
+++ b/Robust/src/Benchmarks/Prefetch/Em3d/javasingle/makefile
@@ -3,10 +3,9 @@ SRC=${MAINCLASS}2.java \
        ${MAINCLASS}Wrap.java \
        BiGraph2.java \
        Node2.java \
-       EVector.java \
-       BarrierNonDSM.java
+       EVector.java 
 default:
-       ../../../../buildscript -optimize -mainclass ${MAINCLASS} ${SRC} -o ${MAINCLASS}
+       ../../../../buildscript -optimize -thread -mainclass ${MAINCLASS} ${SRC} -o ${MAINCLASS}
 
 clean:
        rm -rf tmpbuilddirectory

diff --git a/Robust/src/Benchmarks/Prefetch/LUFact/dsm/Barrier.java b/Robust/src/Benchmarks/Prefetch/LUFact/dsm/Barrier.java
index eb2bedeca5bb817c9d80137e1be1909ee9f74d9f..4f1a680129dc265acafb99c94e16a070bdb3ec2d 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/LUFact/dsm/Barrier.java
+++ b/Robust/src/Benchmarks/Prefetch/LUFact/dsm/Barrier.java
@@ -1,15 +1,15 @@
-public class Barrier {
+public class OldBarrier {
   int numthreads;
   int entercount;
   boolean cleared;
 
-  public Barrier(int n) {
+  public OldBarrier(int n) {
     numthreads=n;
     cleared = false;
     entercount = 0;
   }
 
-  public Barrier() {
+  public OldBarrier() {
   }
 
   public void reset() {
@@ -17,7 +17,7 @@ public class Barrier {
     entercount = 0;
   }
 
-  public static void enterBarrier(Barrier b) {
+  public static void enterBarrier(OldBarrier b) {
     int tmp;
     boolean retry=true, ret1=false, ret2=true;;
 

diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/java/makefile b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/java/makefile
index 6609d97bd0684b5535922952ed34206351e6b496..e9ceb5e2bff22bf786e9a26fb3f3c38cf02ec14b 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/java/makefile
+++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/java/makefile
@@ -1,5 +1,5 @@
 MAINCLASS=MatrixMultiply
-SRC=${MAINCLASS}.java
+SRC=${MAINCLASS}N.java
 default:
        javac ${SRC}
 run:

diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile
index 1361f509022d9cca9d8f7196e780c3a810d0531a..f2a7c19d2412c009d101072bf14723f8ea1d3d2c 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile
+++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile
@@ -1,7 +1,7 @@
 MAINCLASS=MatrixMultiply
 SRC1=${MAINCLASS}N.java
 SRC2=${MAINCLASS}Nrun.java
-FLAGS=-dsm -dsmcaching -prefetch -optimize -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS} -trueprob 0.90
+FLAGS=-dsm -dsmcaching -prefetch -optimize -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS} -trueprob 0.98
 FLAGS1=-dsm -optimize -dsmcaching -mainclass ${MAINCLASS}
 FLAGS2=-dsm -optimize -mainclass ${MAINCLASS}
 default:

diff --git a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/dstm.conf b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/dstm.conf
index 1740034cdeaac8142fec937498965f9de06bf0ac..4b7a736a02e90c1e5bb46bde9f3af6621994acd3 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/dstm.conf
+++ b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/dstm.conf
@@ -3,3 +3,6 @@
 128.195.175.86
 128.195.175.87
 128.195.175.88
+128.195.175.89
+128.195.175.90
+128.195.175.91

diff --git a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/runmicro.sh b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/runmicro.sh
index c17cfbae2da701d4b9f00a3bad76ec3cc5235def..62e68f9471a840d271c434a1c72aba0d710759e9 100755 (executable)
--- a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/runmicro.sh
+++ b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/runmicro.sh
@@ -5,6 +5,9 @@ MACHINES2='dw-11.eecs.uci.edu'
 MACHINES3='dw-11.eecs.uci.edu dw-12.eecs.uci.edu'
 MACHINES4='dw-11.eecs.uci.edu dw-12.eecs.uci.edu dw-13.eecs.uci.edu'
 MACHINES5='dw-11.eecs.uci.edu dw-12.eecs.uci.edu dw-13.eecs.uci.edu dw-14.eecs.uci.edu'
+MACHINES6='dw-11.eecs.uci.edu dw-12.eecs.uci.edu dw-13.eecs.uci.edu dw-14.eecs.uci.edu dw-15.eecs.uci.edu'
+MACHINES7='dw-11.eecs.uci.edu dw-12.eecs.uci.edu dw-13.eecs.uci.edu dw-14.eecs.uci.edu dw-15.eecs.uci.edu dw-16.eecs.uci.edu'
+MACHINES8='dw-11.eecs.uci.edu dw-12.eecs.uci.edu dw-13.eecs.uci.edu dw-14.eecs.uci.edu dw-15.eecs.uci.edu dw-16.eecs.uci.edu dw-17.eecs.uci.edu'
 LOGDIR=/home/adash/research/Robust/src/Benchmarks/Prefetch/runlog
 TOPDIR=`pwd`
 
@@ -30,13 +33,25 @@ function run {
       arg=$ARGS5
       MACHINES=$MACHINES5
     fi
+    if [ $2 -eq 6 ]; then 
+      arg=$ARGS6
+      MACHINES=$MACHINES6
+    fi
+    if [ $2 -eq 7 ]; then 
+      arg=$ARGS7
+      MACHINES=$MACHINES7
+    fi
+    if [ $2 -eq 8 ]; then 
+      arg=$ARGS8
+      MACHINES=$MACHINES8
+    fi
     chmod +x ~/.tmpvars
     for machine in `echo $MACHINES`
     do
       ssh ${machine} 'cd `cat ~/.tmpdir`; source ~/.tmpvars; ./$bin' &
       echo ""
     done
-    sleep 2
+    sleep 2 
     /usr/bin/time -f "%e" ./$3 master $arg 2>> ${LOGDIR}/${3}.txt
     echo "Terminating ... "
     for machine in `echo $MACHINES`
@@ -63,18 +78,27 @@ function callrun {
   NONPREFETCH3=${BENCHMARK}3NP.bin
   NONPREFETCH4=${BENCHMARK}4NP.bin
   NONPREFETCH5=${BENCHMARK}5NP.bin
+  NONPREFETCH6=${BENCHMARK}6NP.bin
+  NONPREFETCH7=${BENCHMARK}7NP.bin
+  NONPREFETCH8=${BENCHMARK}8NP.bin
 
   echo "---------- Running ${BENCHMARK} local non-prefetch on 1 machine ---------- "
-  localrun 1
+  localrun 10
 
   echo "---------- Running ${BENCHMARK} two threads non-prefetch on 2 machines ---------- "
-  run 1 2 $NONPREFETCH2 
+  run 10 2 $NONPREFETCH2 
   echo "---------- Running ${BENCHMARK} three threads non-prefetch on 3 machines ---------- "
-  run 1 3 $NONPREFETCH3 
+  run 10 3 $NONPREFETCH3 
   echo "---------- Running ${BENCHMARK} four threads non-prefetch on 4 machines ---------- "
-  run 1 4 $NONPREFETCH4 
+  run 5 4 $NONPREFETCH4 
   echo "---------- Running ${BENCHMARK} five threads non-prefetch on 5 machines ---------- "
-  run 1 5 $NONPREFETCH5 
+  run 10 5 $NONPREFETCH5 
+  echo "---------- Running ${BENCHMARK} six threads non-prefetch on 6 machines ---------- "
+  run 10 6 $NONPREFETCH6 
+  echo "---------- Running ${BENCHMARK} seven threads non-prefetch on 7 machines ---------- "
+  run 10 7 $NONPREFETCH7 
+  echo "---------- Running ${BENCHMARK} eight threads non-prefetch on 8 machines ---------- "
+  run 10 8 $NONPREFETCH8 
 
   cd $TOPDIR
 }
@@ -92,7 +116,10 @@ do
   ARGS3=`echo $bm | cut -f4 -d":"`
   ARGS4=`echo $bm | cut -f5 -d":"`
   ARGS5=`echo $bm | cut -f6 -d":"`
-  EXTENSION=`echo $bm | cut -f7 -d":"`
+  ARGS6=`echo $bm | cut -f7 -d":"`
+  ARGS7=`echo $bm | cut -f8 -d":"`
+  ARGS8=`echo $bm | cut -f9 -d":"`
+  EXTENSION=`echo $bm | cut -f10 -d":"`
   callrun
 done
 
@@ -100,7 +127,7 @@ done
 for file in `ls ../runlog/*.txt`
 do
   echo -n $file >> average.txt
-  cat $file | awk '{sum += $1} END {print " "sum/NR}' >> average.txt
+  cat $file | grep -v "^Command" | awk '{sum += $1} END {print " "sum/NR}' >> average.txt
 done
 echo "===========" >> average.txt
 echo "" >> average.txt

diff --git a/Robust/src/Benchmarks/Prefetch/bm.txt b/Robust/src/Benchmarks/Prefetch/bm.txt
index b1442179f8096fb155ee536df8e46924f26c02c1..1d20a6a7fc141a628a09e032feafc973f4ba98fe 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/bm.txt
+++ b/Robust/src/Benchmarks/Prefetch/bm.txt
@@ -2,11 +2,22 @@ JGFSORBenchSizeA:SOR/dsm:1:2:3:4:5:6:7:8:sorverA
 JGFSORBenchSizeD:SOR/dsm:1:2:3:4:5:6:7:8:sorverD
 JGFMolDynBenchSizeA:Moldyn/dsm:1:2:3:4:5:6:7:8:moldynverA
 JGFMolDynBenchSizeD:Moldyn/dsm:1:2:3:4:5:6:7:8:moldynverD
-JGFLUFactBenchSizeA:LUFact/dsm:1:2:3:4:lufactverA
-MatrixMultiply:MM200:1 200 30:2 200 30:3 200 30:4 200 30:5 200 30:6 200 30:7 200 30:8 200 30:mmver200
-MatrixMultiply:MatrixMultiply:1 600:2 600:3 600:4 600:5 600:6 600:7 600:8 600:mmver600
+JGFLUFactBenchSizeA:LUFact/dsm:1:2:3:4:5:6:7:8:lufactverA
+MatrixMultiply:MM200:1 200 30:2 200 30:3 200 30:4 200 30:5 200 30:6 200 30:7 200 30:8 200 30:200mmver
+MatrixMultiply:MatrixMultiply:1 800:2 800:3 800:4 800:5 800:6 800:7 800:8 800:800mmver
+MatrixMultiply:MatrixMultiply:1 600:2 600:3 600:4 600:5 600:6 600:7 600:8 600:600mmver
 Em3d:Em3d/dsm:-T 1 -N 4000 -d 130 -p -i 6:-T 2 -N 4000 -d 130 -p -i 6:-T 3 -N 4000 -d 130 -p -i 6:-T 4 -N 4000 -d 130 -p -i 6:-T 5 -N 4000 -d 130 -p -i 6:-T 6 -N 4000 -d 130 -p -i 6:-T 7 -N 4000 -d 130 -p -i 6:-T 8 -N 4000 -d 130 -p -i 6:em3dver40001306
 Em3d:Em3d/dsm:-T 1 -N 6000 -d 200 -p -i 10:-T 2 -N 6000 -d 200 -p -i 10:-T 3 -N 6000 -d 200 -p -i 10:-T 4 -N 6000 -d 200 -p -i 10:-T 5 -N 6000 -d 200 -p -i 10:-T 6 -N 6000 -d 200 -p -i 10:-T 7 -N 6000 -d 200 -p -i 10:-T 8 -N 6000 -d 200 -p -i 10:em3dver600020010
 Em3d:Em3d/dsm:-T 1 -N 10000 -d 1000 -i 15:-T 2 -N 10000 -d 1000 -i 15:-T 3 -N 10000 -d 1000 -i 15:-T 4 -N 10000 -d 1000 -i 15:-T 5 -N 10000 -d 1000 -i 15:-T 6 -N 10000 -d 1000 -i 15:-T 7 -N 10000 -d 1000 -i 15:-T 8 -N 10000 -d 1000 -i 15:em3dver10000100015
 Chase:Chase:::::chase
 Array:Array:::::array
+fft2d:2DFFT/dsm:1 1600:2 1600:3 1600:4 1600:5 1600:6 1600:7 1600:8 1600:1600fft2d
+fft2d:2DFFT/dsm:1 1152:2 1152:3 1152:4 1152:5 1152:6 1152:7 1152:8 1152:1152fft2d
+fft2d:2DFFT/dsm:1 3200:2 3200:3 3200:4 3200:5 3200:6 3200:7 3200:8 3200:3200fft2d
+Heat:HeatFlow/dsm:1 200:2 200:3 200:4 200:5 200:6 200:7 200:8 200:heatflow
+Convolution:2DConv/dsm:1 4096:2 4096:3 4096:4 4096:5 4096:6 4096:7 4096:8 4096:40962dconv
+Convolution:2DConv/dsm:1 8192:2 8192:3 8192:4 8192:5 8192:6 8192:7 8192:8 8192:81922dconv
+Convolution:2DConv/dsm:1 16000:2 16000:3 16000:4 16000:5 16000:6 16000:7 16000:8 16000:160002dconv
+Convolution:2DConv/dsm:1 2048:2 2048:3 2048:4 2048:5 2048:6 2048:7 2048:8 2048:20482dconv
+Convolution:2DConv/dsm:1 1024:2 1024:3 1024:4 1024:5 1024:6 1024:7 1024:8 1024:10242dconv
+Convolution:2DConv/dsm:1 6000:2 6000:3 6000:4 6000:5 6000:6 6000:7 6000:8 6000:60002dconv

diff --git a/Robust/src/Benchmarks/Prefetch/run.sh b/Robust/src/Benchmarks/Prefetch/run.sh
index b4ebdbcc606dcf0f49776a3fc020dcdce34ff116..beb7756bd9f4158f06d2a4c26a3c8b734bedc6df 100755 (executable)
--- a/Robust/src/Benchmarks/Prefetch/run.sh
+++ b/Robust/src/Benchmarks/Prefetch/run.sh
@@ -124,7 +124,7 @@ function callrun {
   cd $BMDIR 
 
   echo "---------- Running local $BMDIR non-prefetch on 1 machine ---------- "
- # localrun 1
+  localrun 10
 
   echo "---------- Running single thread remote $BMDIR non-prefetch + non-cache on 2 machines ---------- "
 #  oneremote 1 1 $NONPREFETCH_NONCACHE
@@ -134,54 +134,54 @@ function callrun {
 #  oneremote 1 1 $PREFETCH
 
   echo "---------- Running two threads $BMDIR non-prefetch + non-cache on 2 machines ---------- "
-  run 1 2 $NONPREFETCH_NONCACHE2 
+  run 10 2 $NONPREFETCH_NONCACHE2 
   echo "---------- Running two threads $BMDIR non-prefetch on 2 machines ---------- "
-  run 1 2 $NONPREFETCH2 
+#  run 1 2 $NONPREFETCH2 
   echo "---------- Running two threads $BMDIR prefetch on 2 machines ---------- "
-  run 1 2 $PREFETCH2 
+  run 10 2 $PREFETCH2 
 
   echo "---------- Running three threads $BMDIR non-prefetch + non-cache on 3 machines ---------- "
-  run 1 3 $NONPREFETCH_NONCACHE3 
+#  run 10 3 $NONPREFETCH_NONCACHE3 
   echo "---------- Running three threads $BMDIR non-prefetch on 3 machines ---------- "
-  run 1 3 $NONPREFETCH3 
+#  run 1 3 $NONPREFETCH3 
   echo "---------- Running three threads $BMDIR prefetch on 3 machines ---------- "
-  run 1 3 $PREFETCH3 
+#  run 10 3 $PREFETCH3 
 
   echo "---------- Running four threads $BMDIR non-prefetch + non-cache on 4 machines ---------- "
-  run 1 4 $NONPREFETCH_NONCACHE4 
+  run 10 4 $NONPREFETCH_NONCACHE4 
   echo "---------- Running four threads $BMDIR non-prefetch on 4 machines ---------- "
-  run 1 4 $NONPREFETCH4 
+#  run 1 4 $NONPREFETCH4 
   echo "---------- Running four threads $BMDIR prefetch on 4 machines ---------- "
-  run 1 4 $PREFETCH4 
+  run 10 4 $PREFETCH4 
 
   echo "---------- Running five threads $BMDIR non-prefetch + non-cache on 5 machines ---------- "
-  run 1 5 $NONPREFETCH_NONCACHE5 
+#  run 1 5 $NONPREFETCH_NONCACHE5 
   echo "---------- Running five threads $BMDIR non-prefetch on 5 machines ---------- "
-  run 1 5 $NONPREFETCH5 
+#  run 1 5 $NONPREFETCH5 
   echo "---------- Running five threads $BMDIR prefetch on 5 machines ---------- "
-  run 1 5 $PREFETCH5
+#  run 1 5 $PREFETCH5
 
   echo "---------- Running six threads $BMDIR non-prefetch + non-cache on 6 machines ---------- "
-  run 1 6 $NONPREFETCH_NONCACHE6 
+#  run 1 6 $NONPREFETCH_NONCACHE6 
   echo "---------- Running six threads $BMDIR non-prefetch on 6 machines ---------- "
-  run 1 6 $NONPREFETCH6 
+#  run 1 6 $NONPREFETCH6 
   echo "---------- Running six threads $BMDIR prefetch on 6 machines ---------- "
-  run 1 6 $PREFETCH6 
+#  run 1 6 $PREFETCH6 
 
 
   echo "---------- Running seven threads $BMDIR non-prefetch + non-cache on 7 machines ---------- "
-  run 1 7 $NONPREFETCH_NONCACHE7 
+#  run 1 7 $NONPREFETCH_NONCACHE7 
   echo "---------- Running seven threads $BMDIR non-prefetch on 7 machines ---------- "
-  run 1 7 $NONPREFETCH7 
+#  run 1 7 $NONPREFETCH7 
   echo "---------- Running seven threads $BMDIR prefetch on 7 machines ---------- "
-  run 1 7 $PREFETCH7 
+#  run 1 7 $PREFETCH7 
 
   echo "---------- Running eight threads $BMDIR non-prefetch + non-cache on 8 machines ---------- "
-  run 1 8 $NONPREFETCH_NONCACHE8 
+  run 10 8 $NONPREFETCH_NONCACHE8 
   echo "---------- Running eight threads $BMDIR non-prefetch on 8 machines ---------- "
-  run 1 8 $NONPREFETCH8 
+#  run 1 8 $NONPREFETCH8 
   echo "---------- Running eight threads $BMDIR prefetch on 8 machines ---------- "
-  run 1 8 $PREFETCH8 
+  run 10 8 $PREFETCH8 
 
   cd $TOPDIR
 }
@@ -202,10 +202,13 @@ function callmicrorun {
   cd $TOPDIR
 }
 
-benchmarks='mmver600 mmver200 moldynverA sorverD em3dver10000100015'
+#benchmarks='em3dver10000100015'
+#benchmarks='sorverD'
+#benchmarks='10242dconv'
+benchmarks='1152fft2d 1600fft2d 40962dconv 20482dconv mmver600 moldynverA'
 
 echo "---------- Clean old files ---------- "
-rm runlog/*
+#rm runlog/*
 for b in `echo $benchmarks`
 do
   bm=`grep $b bm.txt`
@@ -233,7 +236,7 @@ done
 for file in `ls runlog/*.txt`
 do
   echo -n $file >> average.txt
-  cat $file | awk '{sum += $1} END {print " "sum/NR}' >> average.txt
+  cat $file | grep -v "^Command" | awk '{sum += $1} END {print " "sum/NR}' >> average.txt
 done
 echo "===========" >> average.txt
 echo "" >> average.txt

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index 74ab8a8e3122f83644df061a4a1c47c2c3e09ff0..faaeb3203dbf9eb16648c19ef0763ac717141f63 100644 (file)
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -275,6 +275,8 @@ public class BuildCode {
     outmethod.println("printf(\"nprehashSearch= %d\\n\", nprehashSearch);");
     outmethod.println("printf(\"nRemoteReadSend= %d\\n\", nRemoteSend);");
     outmethod.println("printf(\"nSoftAbort= %d\\n\", nSoftAbort);");
+    outmethod.println("printf(\"bytesSent= %d\\n\", bytesSent);");
+    outmethod.println("printf(\"bytesRecv= %d\\n\", bytesRecv);");
     outmethod.println("#endif\n");
     outmethod.println("}");
 
@@ -739,6 +741,8 @@ public class BuildCode {
     outclassdefs.print("extern int nprehashSearch;\n");
     outclassdefs.print("extern int nRemoteSend;\n");
     outclassdefs.print("extern int nSoftAbort;\n");
+    outclassdefs.print("extern int bytesSent;\n");
+    outclassdefs.print("extern int bytesRecv;\n");
     outclassdefs.print("extern void handle();\n");
     outclassdefs.print("#endif\n");
     outclassdefs.print("int numprefetchsites = " + pa.prefetchsiteid + ";\n");

diff --git a/Robust/src/Runtime/DSTM/interface/clookup2.c b/Robust/src/Runtime/DSTM/interface/clookup2.c
index 043d9744d1a93e5dad8b2d52239a53c5df2753d5..6c8b3d976573d6b6e6f5953cba145aa95468365f 100644 (file)
--- a/Robust/src/Runtime/DSTM/interface/clookup2.c
+++ b/Robust/src/Runtime/DSTM/interface/clookup2.c
@@ -45,7 +45,7 @@ void chashInsert(chashtable_t *table, unsigned int key, void *val) {
   }
   index=(key &table->mask)>>1;
   while(1) {
-    node = & table->table[index];    
+    node = & table->table[index];
     if (node->ptr==NULL) {
       node->ptr=val;
       node->key=key;
@@ -64,7 +64,7 @@ INLINE void * chashSearch(chashtable_t *table, unsigned int key) {
   struct chashentry *node;
   unsigned int ckey;
   while(1) {
-    node = & table->table[tmp];    
+    node = & table->table[tmp];
     ckey=node->key;
     if (ckey==key)
       return node->ptr;
@@ -113,7 +113,7 @@ void chashResize(chashtable_t *table, unsigned int newsize) {
        if (bin==newsize)
          bin=0;
       }
-      
+
     }
   }
   free(ptr);            //Free the memory of the old hash table

diff --git a/Robust/src/Runtime/DSTM/interface/signal.c b/Robust/src/Runtime/DSTM/interface/signal.c
index 6cd99c6c914324395cd9f7fe02911d7e90112032..109b2aae6c2a30d01d8828490c93307ef5aac9dc 100644 (file)
--- a/Robust/src/Runtime/DSTM/interface/signal.c
+++ b/Robust/src/Runtime/DSTM/interface/signal.c
@@ -9,6 +9,8 @@ extern int nmhashSearch;
 extern int nprehashSearch;
 extern int nRemoteSend;
 extern int nSoftAbort;
+extern int bytesSent;
+extern int bytesRecv;
 extern unsigned int myIpAddr;
 
 void handle();
@@ -24,6 +26,8 @@ void transStatsHandler(int sig, siginfo_t* info, void *context) {
   printf("nprehashSearch = %d\n", nprehashSearch);
   printf("nRemoteReadSend = %d\n", nRemoteSend);
   printf("nSoftAbort = %d\n", nSoftAbort);
+  printf("bytesSent = %d\n", bytesSent);
+  printf("bytesRecv = %d\n", bytesRecv);
   exit(0);
 #endif
 }

diff --git a/Robust/src/Runtime/DSTM/interface/trans.c b/Robust/src/Runtime/DSTM/interface/trans.c
index ac2893f0847bffa67f7712089f1a778b265c58ac..081ccd21c40563e3cedb7b0632f721d921b40744 100644 (file)
--- a/Robust/src/Runtime/DSTM/interface/trans.c
+++ b/Robust/src/Runtime/DSTM/interface/trans.c
@@ -57,6 +57,8 @@ int nmhashSearch = 0;
 int nprehashSearch = 0;
 int nRemoteSend = 0;
 int nSoftAbort = 0;
+int bytesSent = 0;
+int bytesRecv = 0;
 
 void printhex(unsigned char *, int);
 plistnode_t *createPiles(transrecord_t *);
@@ -71,6 +73,7 @@ void send_data(int fd, void *buf, int buflen) {
   int numbytes;
   while (size > 0) {
     numbytes = send(fd, buffer, size, MSG_NOSIGNAL);
+    bytesSent = bytesSent + numbytes;
     if (numbytes == -1) {
       perror("send");
       exit(0);
@@ -86,6 +89,7 @@ void recv_data(int fd, void *buf, int buflen) {
   int numbytes;
   while (size > 0) {
     numbytes = recv(fd, buffer, size, 0);
+    bytesRecv = bytesRecv + numbytes;
     if (numbytes == -1) {
       perror("recv");
       exit(0);

diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index d9d8f054246eccc407cf538ee1688f85256ce11f..332b24d563fce86f5d8112430e8a523912b7804f 100755 (executable)
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -207,7 +207,7 @@ then
 RAWPATHFLAG=true
 elif [[ $1 = '-runtimedebug' ]]
 then
-EXTRAOPTIONS="$EXTRAOPTIONS -DCHECKTA"
+EXTRAOPTIONS="$EXTRAOPTIONS -DDEBUG"
 elif [[ $1 = '-dsmcaching' ]]
 then
 EXTRAOPTIONS="$EXTRAOPTIONS -DCACHE"