From 8baf8cc61dd02c6c9f2ab72db38ddf9fd3f307ec Mon Sep 17 00:00:00 2001
From: adash <adash>
Date: Wed, 18 Mar 2009 00:15:56 +0000
Subject: [PATCH] Commit all latest files for fse.dsm submission

---
 .../src/Benchmarks/Distributed/RainForest/dsm/makefile |  2 +-
 Robust/src/Benchmarks/Distributed/runall.sh            |  1 -
 Robust/src/Benchmarks/Distributed/runjava.sh           | 10 +---------
 Robust/src/Benchmarks/Prefetch/bm.txt                  |  6 +++++-
 Robust/src/Runtime/DSTM/interface/prefetch.c           |  1 +
 Robust/src/Runtime/DSTM/interface/signal.c             |  2 ++
 Robust/src/Runtime/DSTM/interface/trans.c              |  8 +++++++-
 7 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Robust/src/Benchmarks/Distributed/RainForest/dsm/makefile b/Robust/src/Benchmarks/Distributed/RainForest/dsm/makefile
index 4fee6057..9f117112 100644
--- a/Robust/src/Benchmarks/Distributed/RainForest/dsm/makefile
+++ b/Robust/src/Benchmarks/Distributed/RainForest/dsm/makefile
@@ -11,7 +11,7 @@ SRC=tmp${MAINCLASS}.java \
 	AStarPathFinder.java 
 
 FLAGS1=-dsm -optimize -mainclass ${MAINCLASS}
-FLAGS2=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS}
+FLAGS2=-dsm -dsmcaching -abortreaders -optimize -mainclass ${MAINCLASS}
 FLAGS3=-dsm -dsmcaching -prefetch -optimize -mainclass ${MAINCLASS} -excprefetch BarrierServer.updateAge -excprefetch RainForest.main -excprefetch GameMap.hasRock -excprefetch GameMap.hasTree -trueprob 0.90
 
 default:
diff --git a/Robust/src/Benchmarks/Distributed/runall.sh b/Robust/src/Benchmarks/Distributed/runall.sh
index 748f2a54..dcc08fd2 100755
--- a/Robust/src/Benchmarks/Distributed/runall.sh
+++ b/Robust/src/Benchmarks/Distributed/runall.sh
@@ -2,6 +2,5 @@
 ./runjava.sh 1
 ./runjava.sh 2
 ./runjava.sh 4
-./runjava.sh 6
 ./runjava.sh 8
 echo "done"
diff --git a/Robust/src/Benchmarks/Distributed/runjava.sh b/Robust/src/Benchmarks/Distributed/runjava.sh
index 458414bb..4c58a505 100755
--- a/Robust/src/Benchmarks/Distributed/runjava.sh
+++ b/Robust/src/Benchmarks/Distributed/runjava.sh
@@ -5,7 +5,7 @@ DSTM_CONFDIR=${HOME}/research/Robust/src
 JAVA_DIR=java
 JVM_DIR=jvm
 DSM_DIR=dsm
-ITERATIONS=2
+ITERATIONS=10
 TOPDIR=${HOME}/research/Robust/src/Prefetch
 
 function killclients {
@@ -31,7 +31,6 @@ function runjava {
    # Start the clients
    k=1;
    echo ${BASEDIR}/${BM_DIR} > ~/.tmpdir
-   perl -x${TOPDIR} ${TOPDIR}/switch/fetch_stat.pl clear_stats settings=switch/clearsettings.txt
    while [ $k -le $1 ]; do
      echo "SSH into dc-${k}"
      SEED=`expr $k \* 100`
@@ -46,13 +45,6 @@ function runjava {
    done
    killclients $k
    sleep 10;
-   perl -x${TOPDIR} ${TOPDIR}/switch/fetch_stat.pl settings=switch/settings.txt
-   cat ${LOGDIR}/tmp >> ${LOGDIR}/${BM_NAME}_${1}Thrd.txt
-   if [ $i -eq 0 ];then echo "<h3> Benchmark=${BM_NAME} Thread=${1}</h3><br>" > ${LOGDIR}/${BM_NAME}_${1}Thrd_a.html  ;fi
-   cat ${LOGDIR}/tmp >> ${LOGDIR}/${BM_NAME}_${1}Thrd_a.html
-   echo "<a href=\"${BM_NAME}_${1}Thrd_${j}.html\">Network Stats</a><br>" >> ${LOGDIR}/${BM_NAME}_${1}Thrd_a.html
-   mv ${TOPDIR}/html/dell.html ${LOGDIR}/${BM_NAME}_${1}Thrd_${j}.html
-
    j=`expr $j + 1`
    cd -
   done
diff --git a/Robust/src/Benchmarks/Prefetch/bm.txt b/Robust/src/Benchmarks/Prefetch/bm.txt
index fa74ed87..fe4421b4 100644
--- a/Robust/src/Benchmarks/Prefetch/bm.txt
+++ b/Robust/src/Benchmarks/Prefetch/bm.txt
@@ -8,10 +8,11 @@ JGFLUFactBenchSizeA:LUFact/dsm:1:2:3:4:5:6:7:8:lufactverA
 MatrixMultiply:MatrixMultiply/dsm:1 800:2 800:3 800:4 800:5 800:6 800:7 800:8 800:800mmver
 MatrixMultiply:MatrixMultiply/dsm:1 600:2 600:3 600:4 600:5 600:6 600:7 600:8 600:600mmver
 MatrixMultiply:MatrixMultiply/dsm:1 1200:2 1200:3 1200:4 1200:5 1200:6 1200:7 1200:8 1200:1200mmver
+MatrixMultiply:MatrixMultiply/dsm:1 2048:2 2048:3 2048:4 2048:5 2048:6 2048:7 2048:8 2048:2048mmver
 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
+Chase:Chase:1000000:1000000:1000000:1000000:1000000:1000000:1000000:1000000: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
@@ -25,5 +26,8 @@ Convolution:2DConv/dsm:1 2048:2 2048:3 2048:4 2048:5 2048:6 2048:7 2048:8 2048:2
 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
 LookUpService:../Distributed/LookUpService/dsm2:-N 1 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 2 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 3 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 4 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 5 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 6 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 7 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:-N 8 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 10:10lookup
+LookUpService:../Distributed/LookUpService/dsm2:-N 1 -nEntry 160 -nTrans 1000 -probRead 80 -nLookUp 10:-N 2 -nEntry 160 -nTrans 1000 -probRead 80 -nLookUp 10:-N 3 -nEntry 160 -nTrans 1000 -probRead 80 -nLookUp 10:-N 4 -nEntry 160 -nTrans 1000 -probRead 80 -nLookUp 10:-N 5 -nEntry 160 -nTrans 1000 -probRead 80 -nLookUp 10:-N 6 -nEntry 160 -nTrans 1000 -probRead 80 -nLookUp 10:-N 7 -nEntry 160 -nTrans 1000 -probRead 80 -nLookUp 10:-N 8 -nEntry 160 -nTrans 1000 -probRead 80 -nLookUp 10:80lookup
 LookUpService:../Distributed/LookUpService/dsm:-N 1 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 15:-N 2 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 15:-N 3 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 15:-N 4 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 15:-N 5 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 15:-N 6 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 15:-N 7 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 15:-N 8 -nEntry 160 -nTrans 1000 -probRead 96 -nLookUp 15:15lookup
+LookUpService:../Distributed/LookUpService/dsm2:-N 1 -nEntry 160 -nTrans 1000 -probRead 65 -nLookUp 10:-N 2 -nEntry 160 -nTrans 1000 -probRead 65 -nLookUp 10:-N 3 -nEntry 160 -nTrans 1000 -probRead 65 -nLookUp 10:-N 4 -nEntry 160 -nTrans 1000 -probRead 65 -nLookUp 10:-N 5 -nEntry 160 -nTrans 1000 -probRead 65 -nLookUp 10:-N 6 -nEntry 160 -nTrans 1000 -probRead 65 -nLookUp 10:-N 7 -nEntry 160 -nTrans 1000 -probRead 65 -nLookUp 10:-N 8 -nEntry 160 -nTrans 1000 -probRead 65 -nLookUp 10:65lookup
+LookUpService:../Distributed/LookUpService/dsm2:-N 1 -nEntry 160 -nTrans 1000 -probRead 50 -nLookUp 10:-N 2 -nEntry 160 -nTrans 1000 -probRead 50 -nLookUp 10:-N 3 -nEntry 160 -nTrans 1000 -probRead 50 -nLookUp 10:-N 4 -nEntry 160 -nTrans 1000 -probRead 50 -nLookUp 10:-N 5 -nEntry 160 -nTrans 1000 -probRead 50 -nLookUp 10:-N 6 -nEntry 160 -nTrans 1000 -probRead 50 -nLookUp 10:-N 7 -nEntry 160 -nTrans 1000 -probRead 50 -nLookUp 10:-N 8 -nEntry 160 -nTrans 1000 -probRead 50 -nLookUp 10:50lookup
 RainForest:../Distributed/RainForest/dsm:-N 1:-N 2:-N 3:-N 4:-N 5:-N 6:-N 7:-N 8:rainforest
diff --git a/Robust/src/Runtime/DSTM/interface/prefetch.c b/Robust/src/Runtime/DSTM/interface/prefetch.c
index b85deec8..de522845 100644
--- a/Robust/src/Runtime/DSTM/interface/prefetch.c
+++ b/Robust/src/Runtime/DSTM/interface/prefetch.c
@@ -121,6 +121,7 @@ perMcPrefetchList_t *processLocal(char *ptr) {
 }
 
 #define PBUFFERSIZE 16384
+//#define PBUFFERSIZE 8192 //Used only for Moldyn benchmark
 
 
 perMcPrefetchList_t *processRemote(unsigned int oid,  short * offsetarray, int sd, short numoffset) {
diff --git a/Robust/src/Runtime/DSTM/interface/signal.c b/Robust/src/Runtime/DSTM/interface/signal.c
index db266bcd..094e9c9d 100644
--- a/Robust/src/Runtime/DSTM/interface/signal.c
+++ b/Robust/src/Runtime/DSTM/interface/signal.c
@@ -12,6 +12,7 @@ extern int nRemoteSend;
 extern int nSoftAbort;
 extern int bytesSent;
 extern int bytesRecv;
+extern int totalObjSize;
 extern unsigned int myIpAddr;
 
 void handle();
@@ -34,6 +35,7 @@ void transStatsHandler(int sig, siginfo_t* info, void *context) {
   fprintf(fp, "nSoftAbort = %d\n", nSoftAbort);
   fprintf(fp, "bytesSent = %d\n", bytesSent);
   fprintf(fp, "bytesRecv = %d\n", bytesRecv);
+  fprintf(fp, "totalObjSize= %d\n", totalObjSize);
   fprintf(fp, "**********************************\n");
   fflush(fp);
   fclose(fp);
diff --git a/Robust/src/Runtime/DSTM/interface/trans.c b/Robust/src/Runtime/DSTM/interface/trans.c
index 8e654af4..b6ac84bf 100644
--- a/Robust/src/Runtime/DSTM/interface/trans.c
+++ b/Robust/src/Runtime/DSTM/interface/trans.c
@@ -71,6 +71,7 @@ int nRemoteSend = 0;
 int nSoftAbort = 0;
 int bytesSent = 0;
 int bytesRecv = 0;
+int totalObjSize = 0;
 
 void printhex(unsigned char *, int);
 plistnode_t *createPiles();
@@ -663,7 +664,9 @@ int transCommit() {
 #ifdef ABORTREADERS
   if (t_abort) {
     //abort this transaction
-    printf("ABORTING TRANSACTION AT COMMIT\n");
+    /* Debug
+     * printf("ABORTING TRANSACTION AT COMMIT\n");
+     */
     removetransactionhash();
     objstrDelete(t_cache);
     t_chashDelete();
@@ -1101,6 +1104,9 @@ void *getRemoteObj(unsigned int mnum, unsigned int oid) {
     STATUS(objcopy)=0;
     /* Insert into cache's lookup table */
     t_chashInsert(oid, objcopy);
+#ifdef TRANSSTATS
+    totalObjSize += size;
+#endif
   }
 
   return objcopy;
-- 
2.34.1