From: bdemsky <bdemsky>
Date: Mon, 15 Feb 2010 08:07:35 +0000 (+0000)
Subject: fix code organization
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0e813866eeaad5bff2bda0e63ffcbfb18b79083f;p=IRC.git

fix code organization
---

diff --git a/Robust/src/Runtime/DSTM/interface/addUdpEnhance.c b/Robust/src/Runtime/DSTM/interface/addUdpEnhance.c
index 71bc6baf..eb968c92 100644
--- a/Robust/src/Runtime/DSTM/interface/addUdpEnhance.c
+++ b/Robust/src/Runtime/DSTM/interface/addUdpEnhance.c
@@ -131,11 +131,6 @@ int invalidateObj(trans_req_data_t *tdata, int pilecount, char finalresponse, in
     printf("%s() error in sending udp message at %s, %d\n", __func__, __FILE__, __LINE__);
     return -1;
   }
-  /* Send trans commit or abort message when prefetching or caching */
-  for(i=0;i<pilecount;i++){
-    if(socklist[i] !=0)
-      send_data(socklist[i], &finalresponse, sizeof(char));
-  }
   return 0;
 }
 
diff --git a/Robust/src/Runtime/DSTM/interface/trans.c b/Robust/src/Runtime/DSTM/interface/trans.c
index eaf70309..9c2e4ffe 100644
--- a/Robust/src/Runtime/DSTM/interface/trans.c
+++ b/Robust/src/Runtime/DSTM/interface/trans.c
@@ -1134,6 +1134,18 @@ int transCommit() {
       return 1;
     }
 
+#ifdef CACHE
+    if (finalResponse == TRANS_COMMIT) {
+      /* Invalidate objects in other machine cache */
+      int retval;
+      if((retval = invalidateObj(tosend, pilecount,finalResponse,socklist)) != 0) {
+	printf("Error: %s() in invalidating Objects %s, %d\n", __func__, __FILE__, __LINE__);
+	free(tosend);
+	free(listmid);
+	return 1;
+      }
+    }
+#endif
     /* Send responses to all machines */
     for(i = 0; i < pilecount; i++) {
       int sd = socklist[i];
@@ -1160,9 +1172,7 @@ int transCommit() {
 	}
 #endif
 #endif
-#ifndef CACHE
-    send_data(sd, &finalResponse, sizeof(char));
-#endif
+	send_data(sd, &finalResponse, sizeof(char));
       } else {
 	/* Complete local processing */
 	doLocalProcess(finalResponse, &(tosend[i]), &transinfo);
@@ -1178,18 +1188,6 @@ int transCommit() {
       }
     }
 
-#ifdef CACHE
-    {
-      /* Invalidate objects in other machine cache */
-      int retval;
-      if((retval = invalidateObj(tosend, pilecount,finalResponse,socklist)) != 0) {
-	printf("Error: %s() in invalidating Objects %s, %d\n", __func__, __FILE__, __LINE__);
-	free(tosend);
-	free(listmid);
-	return 1;
-      }
-    }
-#endif
     /* Free resources */
     free(tosend);
     free(listmid);