From: adash <adash>
Date: Mon, 28 Jun 2010 23:57:37 +0000 (+0000)
Subject: changes for debugging
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8696a0ec6d75b92cccf5906b808c7fc07a9887fa;p=IRC.git

changes for debugging
---

diff --git a/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java
index c66c30ab..d98bc43f 100644
--- a/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java
+++ b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/FileSystem.java
@@ -33,8 +33,11 @@ public class FileSystem extends Thread {
       current=root.makeDirectory(global new GlobalString(String.valueOf(mid)));
     }
     Random r=new Random();
+    System.out.println("Starting FileSystem");
     char ptr[]=new char[1024];
-    for(int i=0;i<40000;i++) {
+    //for(int i=0;i<40000;i++) {
+    for(int i=0;i<15000;i++) {
+      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/FileSystem/recovery/makefile b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/makefile
index 4d744bd5..b4ff273d 100644
--- a/Robust/src/Benchmarks/Recovery/FileSystem/recovery/makefile
+++ b/Robust/src/Benchmarks/Recovery/FileSystem/recovery/makefile
@@ -3,7 +3,7 @@ SRC1=${MAINCLASS}.java \
      DistributedHashMap.java \
      Directory.java \
      DFile.java
-FLAGS= -recovery -recoverystats -transstats -dsm -dsmcaching -debug -optimize -mainclass ${MAINCLASS}
+FLAGS= -recovery -recoverystats -transstats -dsm -dsmcaching -debug -nooptimize -mainclass ${MAINCLASS}
 DSMFLAGS=-transstats -dsm -dsmcaching -optimize -mainclass ${MAINCLASS}
 default:
 	../../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC1}
diff --git a/Robust/src/Runtime/DSTM/interface_recovery/dstmserver.c b/Robust/src/Runtime/DSTM/interface_recovery/dstmserver.c
index 8959a126..dbd4b745 100644
--- a/Robust/src/Runtime/DSTM/interface_recovery/dstmserver.c
+++ b/Robust/src/Runtime/DSTM/interface_recovery/dstmserver.c
@@ -971,8 +971,7 @@ int processClientReq(fixed_data_t *fixed, trans_commit_data_t *transinfo,
     }
     else {
       tNode->status = TRANS_WAIT;
-//      printf("%s -> Waiting!! \ttransID : %u decision : %d status : %d \n",__func__,tNode->transid,tNode->decision,tNode->status);
-//      sleep(3);
+      printf("%s -> Waiting!! \ttransID : %u decision : %d status : %d \n",__func__,tNode->transid,tNode->decision,tNode->status);
       randomdelay();
     }
     
diff --git a/Robust/src/Runtime/DSTM/interface_recovery/trans.c b/Robust/src/Runtime/DSTM/interface_recovery/trans.c
index 7591bc6c..d82e2a95 100644
--- a/Robust/src/Runtime/DSTM/interface_recovery/trans.c
+++ b/Robust/src/Runtime/DSTM/interface_recovery/trans.c
@@ -1534,7 +1534,7 @@ int transCommit() {
     objstrDelete(t_cache);
     t_chashDelete();
 #ifdef RECOVERY
-    if(deadmid != -1) { /* if deadmid is greater than or equal to 0,                           then there is dead machine. */
+    if(deadmid != -1) { /* if deadmid is greater than or equal to 0, then there is dead machine. */
       notifyLeaderDeadMachine(deadmid);
     }
 #endif
@@ -1881,7 +1881,7 @@ void restoreDuplicationState(unsigned int deadHost,unsigned int epoch_num)
     do {
       sdlist = getSocketLists();
   
-//      printf("%s -> I'm currently leader num : %d ping machines\n\n",__func__,epoch_num);
+      printf("%s -> I'm currently leader num : %d ping machines\n\n",__func__,epoch_num);
       if((flag = pingMachines(epoch_num,sdlist,&tList)) < 0) break;
 
       pthread_mutex_lock(&translist_mutex);
@@ -1911,9 +1911,9 @@ void restoreDuplicationState(unsigned int deadHost,unsigned int epoch_num)
   }while(0);
 
   if(flag < 0) {
-//    printf("%s -> higher epoch\n",__func__);
+    printf("%s -> higher epoch\n",__func__);
     while(okCommit != TRANS_OK) {
-//      printf("%s -> Waiting\n",__func__);
+      //printf("%s -> Waiting\n",__func__);
       randomdelay();
     }
     
diff --git a/Robust/src/Runtime/DSTM/interface_recovery/translist.c b/Robust/src/Runtime/DSTM/interface_recovery/translist.c
index 8176fd5e..18e4416f 100644
--- a/Robust/src/Runtime/DSTM/interface_recovery/translist.c
+++ b/Robust/src/Runtime/DSTM/interface_recovery/translist.c
@@ -102,7 +102,7 @@ tlist_t* tlistRemove(tlist_t* transList,unsigned int transid)
 {
 //  printf("%s -> REMOVE transID : %u \n",__func__,transid);
 
-  int flag = -1;
+  //int flag = -1;
   tlist_node_t* tmp;
   tlist_node_t* ptr = transList->head;
   tlist_node_t* prev = NULL;
@@ -133,7 +133,7 @@ tlist_t* tlistRemove(tlist_t* transList,unsigned int transid)
       prev->next = ptr->next;
       free(ptr);
       (transList->size)--;
-      flag = 0;
+      //flag = 0;
       transList->flag = 1;
       return transList;
     }