Changes to increase garbage collector heap

[IRC.git] / Robust / src / Runtime / DSTM / interface / addUdpEnhance.c

diff --git a/Robust/src/Runtime/DSTM/interface/addUdpEnhance.c b/Robust/src/Runtime/DSTM/interface/addUdpEnhance.c
index aa8eeb82ef36bc9467dbe18cb61c8cdc17b219e2..8280d15f08517e8f2fb88682db4b99ec34783394 100644 (file)
--- a/Robust/src/Runtime/DSTM/interface/addUdpEnhance.c
+++ b/Robust/src/Runtime/DSTM/interface/addUdpEnhance.c
@@ -50,7 +50,7 @@ int udpInit() {
     exit(1);
   }
 
-#ifdef MAC 
+#ifdef MAC
   if(setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &setsockflag, sizeof(setsockflag)) < 0) {
     perror("socket");
     exit(1);
@@ -89,14 +89,15 @@ void *udpListenBroadcast(void *sockfd) {
     }
     short status = *((short *) &readBuffer[0]);
     switch (status) {
-      case INVALIDATE_OBJS:
-        if((retval = invalidateFromPrefetchCache(readBuffer))!= 0) {
-          printf("Error: In invalidateFromPrefetchCache() at %s, %d\n", __FILE__, __LINE__);
-          break;
-        }
-        break;
-      default:
-        printf("Error: Cannot regcognize the status in file %s, at line %d\n", __FILE__, __LINE__);
+    case INVALIDATE_OBJS:
+      if((retval = invalidateFromPrefetchCache(readBuffer))!= 0) {
+       printf("Error: In invalidateFromPrefetchCache() at %s, %d\n", __FILE__, __LINE__);
+       break;
+      }
+      break;
+
+    default:
+      printf("Error: Cannot regcognize the status in file %s, at line %d\n", __FILE__, __LINE__);
     }
   }
 
@@ -109,7 +110,7 @@ void *udpListenBroadcast(void *sockfd) {
 /* Function that invalidate objects that
  * have been currently modified
  * returns -1 on error and 0 on success */
-int invalidateObj(thread_data_array_t *tdata) {
+int invalidateObj(trans_req_data_t *tdata) {
   struct sockaddr_in clientaddr;
   int retval;
 
@@ -118,7 +119,7 @@ int invalidateObj(thread_data_array_t *tdata) {
   clientaddr.sin_port = htons(UDP_PORT);
   clientaddr.sin_addr.s_addr = INADDR_BROADCAST;
   int maxObjsPerMsg = (MAX_SIZE - 2*sizeof(unsigned int))/sizeof(unsigned int);
-  if(tdata->buffer->f.nummod < maxObjsPerMsg) {
+  if(tdata->f.nummod < maxObjsPerMsg) {
     /* send single udp msg */
     int iteration = 0;
     if((retval = sendUdpMsg(tdata, &clientaddr, iteration)) < 0) {
@@ -127,23 +128,23 @@ int invalidateObj(thread_data_array_t *tdata) {
     }
   } else {
     /* Split into several udp msgs */
-    int maxUdpMsg = tdata->buffer->f.nummod/maxObjsPerMsg;
-    if (tdata->buffer->f.nummod%maxObjsPerMsg) maxUdpMsg++;
+    int maxUdpMsg = tdata->f.nummod/maxObjsPerMsg;
+    if (tdata->f.nummod%maxObjsPerMsg) maxUdpMsg++;
     int i;
     for(i = 1; i <= maxUdpMsg; i++) {
       if((retval = sendUdpMsg(tdata, &clientaddr, i)) < 0) {
-        printf("%s() error in sending udp message at %s, %d\n", __func__, __FILE__, __LINE__);
-        return -1;
+       printf("%s() error in sending udp message at %s, %d\n", __func__, __FILE__, __LINE__);
+       return -1;
       }
     }
   }
   return 0;
 }
 
-/* Function sends a udp broadcast, also distinguishes 
+/* Function sends a udp broadcast, also distinguishes
  * msg size to be sent based on the iteration flag
  * returns -1 on error and 0 on success */
-int sendUdpMsg(thread_data_array_t *tdata, struct sockaddr_in *clientaddr, int iteration) {
+int sendUdpMsg(trans_req_data_t *tdata, struct sockaddr_in *clientaddr, int iteration) {
   char writeBuffer[MAX_SIZE];
   int maxObjsPerMsg = (MAX_SIZE - 2*sizeof(unsigned int))/sizeof(unsigned int);
   int offset = 0;
@@ -152,25 +153,25 @@ int sendUdpMsg(thread_data_array_t *tdata, struct sockaddr_in *clientaddr, int i
   *((unsigned int *)(writeBuffer+offset)) = myIpAddr; //mid sending invalidation
   offset += sizeof(unsigned int);
   if(iteration == 0) { // iteration flag == zero, send single udp msg
-    *((short *) (writeBuffer+offset)) = (short) (sizeof(unsigned int) * (tdata->buffer->f.nummod)); //sizeof msg
+    *((short *)(writeBuffer+offset)) = (short) (sizeof(unsigned int) * (tdata->f.nummod));  //sizeof msg
     offset += sizeof(short);
     int i;
-    for(i = 0; i < tdata->buffer->f.nummod; i++) {
-      *((unsigned int *) (writeBuffer+offset)) = tdata->buffer->oidmod[i];  //copy objects
+    for(i = 0; i < tdata->f.nummod; i++) {
+      *((unsigned int *) (writeBuffer+offset)) = tdata->oidmod[i];  //copy objects
       offset += sizeof(unsigned int);
     }
   } else { // iteration flag > zero, send multiple udp msg
     int numObj;
-    if((tdata->buffer->f.nummod - (iteration * maxObjsPerMsg)) > 0) 
+    if((tdata->f.nummod - (iteration * maxObjsPerMsg)) > 0)
       numObj = maxObjsPerMsg;
-    else  
-      numObj = tdata->buffer->f.nummod - ((iteration - 1)*maxObjsPerMsg);
-    *((short *) (writeBuffer+offset)) = (short) (sizeof(unsigned int) * numObj);
+    else
+      numObj = tdata->f.nummod - ((iteration - 1)*maxObjsPerMsg);
+    *((short *)(writeBuffer+offset)) = (short) (sizeof(unsigned int) * numObj);
     offset += sizeof(short);
     int index = (iteration - 1) * maxObjsPerMsg;
     int i;
     for(i = 0; i < numObj; i++) {
-      *((unsigned int *) (writeBuffer+offset)) = tdata->buffer->oidmod[index+i];
+      *((unsigned int *) (writeBuffer+offset)) = tdata->oidmod[index+i];
       offset += sizeof(unsigned int);
     }
   }
@@ -181,9 +182,9 @@ int sendUdpMsg(thread_data_array_t *tdata, struct sockaddr_in *clientaddr, int i
     return -1;
   }
   return 0;
-} 
+}
 
-/* Function searches given oid in prefetch cache and invalidates obj from cache 
+/* Function searches given oid in prefetch cache and invalidates obj from cache
  * returns -1 on error and 0 on success */
 int invalidateFromPrefetchCache(char *buffer) {
   int offset = sizeof(short);
@@ -194,14 +195,15 @@ int invalidateFromPrefetchCache(char *buffer) {
   if(mid != myIpAddr) {
     /* Read objects sent */
     int numObjsRecv = *((short *)(buffer+offset)) / sizeof(unsigned int);
+    offset += sizeof(short);
     int i;
     for(i = 0; i < numObjsRecv; i++) {
       unsigned int oid;
       oid = *((unsigned int *)(buffer+offset));
       objheader_t *header;
       /* Lookup Objects in prefetch cache and remove them */
-      if((header = prehashSearch(oid)) != NULL) {
-        prehashRemove(oid);
+      if(((header = prehashSearch(oid)) != NULL)) {
+       prehashRemove(oid);
       }
       offset += sizeof(unsigned int);
     }