From: jihoonl <jihoonl>
Date: Fri, 2 Jul 2010 02:19:58 +0000 (+0000)
Subject: recovery done
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a5a8cd9c7369d81ee688c0b5c52579d5e214094d;p=IRC.git

recovery done
---

diff --git a/Robust/src/Runtime/DSTM/interface_recovery/dstmserver.c b/Robust/src/Runtime/DSTM/interface_recovery/dstmserver.c
index 8c31e2dc..55749251 100644
--- a/Robust/src/Runtime/DSTM/interface_recovery/dstmserver.c
+++ b/Robust/src/Runtime/DSTM/interface_recovery/dstmserver.c
@@ -717,7 +717,7 @@ int readDuplicateObjs(int acceptfd) {
   int timeout1;
   int timeout2;
 
-#ifndef DEBUG
+#ifdef DEBUG
 	printf("%s-> Start\n", __func__);
 #endif
 	timeout1 = recv_data((int)acceptfd, &numoid, sizeof(unsigned int));
@@ -794,14 +794,14 @@ int readDuplicateObjs(int acceptfd) {
       }
   		ptr += tmpsize;
 		}
-#ifndef DEBUG
+#ifdef DEBUG
 		printf("%s-> End\n", __func__);
 #endif
     free(dupeptr);
 		return size;
 	}
 	else {
-#ifndef DEBUG
+#ifdef DEBUG
 		printf("%s-> No objects duplicated\n", __func__);
 #endif
 		return 0;
@@ -1191,7 +1191,6 @@ char handleTransReq(fixed_data_t *fixed, trans_commit_data_t *transinfo, unsigne
       printf("control = %d\n",control);
     control=TRANS_DISAGREE;
 
-    printf("%s -> Sent message!\n",__func__);
 		send_data(acceptfd, &control, sizeof(char));
 #ifdef CACHE
 		send_data(acceptfd, &numBytes, sizeof(int));
diff --git a/Robust/src/Runtime/DSTM/interface_recovery/trans.c b/Robust/src/Runtime/DSTM/interface_recovery/trans.c
index 1c8cfb7e..042e9ffa 100644
--- a/Robust/src/Runtime/DSTM/interface_recovery/trans.c
+++ b/Robust/src/Runtime/DSTM/interface_recovery/trans.c
@@ -1881,10 +1881,10 @@ void restoreDuplicationState(unsigned int deadHost,unsigned int epoch_num)
 //      tlistPrint(tList);
       pthread_mutex_unlock(&translist_mutex);
 //      getchar();
-      printf("%s -> I'm currently leader num : %d releaseing new lists\n\n",__func__,epoch_num);
+//      printf("%s -> I'm currently leader num : %d releaseing new lists\n\n",__func__,epoch_num);
       if((flag = releaseNewLists(epoch_num,sdlist,tList)) < 0) break;
   //    getchar();
-      printf("%s -> I'm currently leader num : %d duplicate objects\n\n",__func__,epoch_num);
+//      printf("%s -> I'm currently leader num : %d duplicate objects\n\n",__func__,epoch_num);
       // transfer lost objects
       if((flag= duplicateLostObjects(epoch_num,sdlist)) < 0) break;
 
@@ -2054,7 +2054,6 @@ int pingMachines(unsigned int epoch_num,int* sdlist,tlist_t** tList)
       return -2;
     }
 
-    printf("recevied response = %d\n",response);
     if(response == RESPOND_TRANS_WAIT) 
     {
 //      printf("%s -> RESPOND_TRANS_WAIT\n",__func__);
@@ -2097,7 +2096,7 @@ int pingMachines(unsigned int epoch_num,int* sdlist,tlist_t** tList)
   }
   *tList = currentTransactionList;
 
-  printf("%s -> Exit\n",__func__);
+//  printf("%s -> Exit\n",__func__);
   return 0;
 }
 
@@ -2171,7 +2170,6 @@ int releaseNewLists(unsigned int epoch_num,int* sdlist,tlist_t* tlist)
     }
   }
 
-  printf("%s -> After sending msg\n",__func__);
   if(size > 0)
     free(tArray);
 
@@ -2195,7 +2193,7 @@ int releaseNewLists(unsigned int epoch_num,int* sdlist,tlist_t* tlist)
     }
   }
   tlistDestroy(tlist);  
-  printf("%s -> End\n",__func__);
+//  printf("%s -> End\n",__func__);
   return 0;
 }
 
@@ -2224,12 +2222,12 @@ int makeTransactionLists(tlist_t** tlist,int sd,unsigned int epoch_num)
     return -2;
   }
 
-  printf("%s -> Received TransArray\n",__func__);
+/*  printf("%s -> Received TransArray\n",__func__);
   for(i = 0; i< size; i++) {
     printf("ID : %u  Decision : %d  status : %d\n",transArray[i].transid,transArray[i].decision,transArray[i].status);
   }
   printf("%s -> End transArray\n",__func__);
-
+*/
   // add into currentTransactionList
   for(j = 0 ; j < size; j ++) {
     tmp = tlistSearch(*tlist,transArray[j].transid);
@@ -2238,7 +2236,7 @@ int makeTransactionLists(tlist_t** tlist,int sd,unsigned int epoch_num)
       tlist_node_t* tNode = &transArray[j];
       tNode->status = TRANS_OK;
 
-      printf("%s -> transid = %u decision = %d\n",__func__,transArray[j].transid,transArray[j].decision);
+//      printf("%s -> transid = %u decision = %d\n",__func__,transArray[j].transid,transArray[j].decision);
       *tlist = tlistInsertNode2(*tlist,&(transArray[j]),epoch_num);
     }
     else {
@@ -2289,7 +2287,7 @@ void restartTransactions(unsigned int epoch_num,int* sdlist)
     if(sdlist[i] == -1) 
       continue;
 
-    printf("%s -> request to %s\n",__func__,midtoIPString(hostIpAddrs[i]));
+//    printf("%s -> request to %s\n",__func__,midtoIPString(hostIpAddrs[i]));
     request = REQUEST_TRANS_RESTART;
     send_data(sdlist[i], &request, sizeof(char));
     send_data(sdlist[i], &epoch_num,sizeof(char));