From: bdemsky <bdemsky>
Date: Thu, 17 Apr 2008 00:27:59 +0000 (+0000)
Subject: changes and bug fixes
X-Git-Tag: preEdgeChange~147
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=452c9aef7e8d1d2745db2354071d246013e02ece;p=IRC.git

changes and bug fixes
---

diff --git a/Robust/src/Runtime/DSTM/interface/dstmserver.c b/Robust/src/Runtime/DSTM/interface/dstmserver.c
index 07dc2c83..18c1d0b8 100644
--- a/Robust/src/Runtime/DSTM/interface/dstmserver.c
+++ b/Robust/src/Runtime/DSTM/interface/dstmserver.c
@@ -672,6 +672,10 @@ int prefetchReq(int acceptfd) {
 	  oid = *((unsigned int *)(((char *)header) + sizeof(objheader_t) + offsetarry[i]));
 	}
 	
+	/* Don't continue if we hit a NULL pointer */
+	if (oid==0)
+	  break;
+
 	if((header = mhashSearch(oid)) == NULL) {
 	  size = sizeof(int) + sizeof(char) + sizeof(unsigned int) ;
 	  char sendbuffer[size];
diff --git a/Robust/src/Runtime/DSTM/interface/objstr.c b/Robust/src/Runtime/DSTM/interface/objstr.c
index 991bd239..a8910138 100644
--- a/Robust/src/Runtime/DSTM/interface/objstr.c
+++ b/Robust/src/Runtime/DSTM/interface/objstr.c
@@ -60,11 +60,3 @@ void *objstrAlloc(objstr_t *store, unsigned int size)
 			store = store->next;
 	}
 }
-
-void clearObjStore() {
-  objstr_t *tmp = prefetchcache;
-  while(tmp != NULL) {
-    bzero(tmp+1, tmp->size);
-    tmp = tmp->next;
-  }
-}
diff --git a/Robust/src/Runtime/DSTM/interface/trans.c b/Robust/src/Runtime/DSTM/interface/trans.c
index 4ffc9d25..3644d968 100644
--- a/Robust/src/Runtime/DSTM/interface/trans.c
+++ b/Robust/src/Runtime/DSTM/interface/trans.c
@@ -131,7 +131,13 @@ void prefetch(int ntuples, unsigned int *oids, unsigned short *endoffsets, short
   int top=endoffsets[ntuples-1];
   *((int *)(node+len))=ntuples;
   len += sizeof(int);
-  
+  /*  int i;
+  for(i=0;i<ntuples;i++) {
+    if (oids[i]%2==0&&(oids[i]!=0)) {
+      printf("Bad oid %ld\n",oids[i]);
+    }
+    }*/
+
   memcpy(node+len, oids, ntuples*sizeof(unsigned int));
   memcpy(node+len+ntuples*sizeof(unsigned int), endoffsets, ntuples*sizeof(unsigned short));
   memcpy(node+len+ntuples*(sizeof(unsigned int)+sizeof(short)), arrayfields, top*sizeof(short));
@@ -278,7 +284,6 @@ objheader_t *transRead(transrecord_t *record, unsigned int oid) {
   void *buf;
   
   if(oid == 0) {
-    printf("Error: %s, %d oid is NULL \n", __FILE__, __LINE__);
     return NULL;
   }
   
@@ -1025,6 +1030,8 @@ prefetchpile_t *foundLocal(prefetchqelem_t *node) {
     unsigned int oid=oidarray[i];
     int newbase;
     int machinenum;
+    if (oid==0)
+      continue;
     //Look up fields locally
     for(newbase=baseindex;newbase<endindex;newbase++) {
       if (!lookupObject(&oid, arryfields[newbase]))
@@ -1238,7 +1245,7 @@ int getPrefetchResponse(int sd) {
     /* TODO: For each object not found query DHT for new location and retrieve the object */
     /* Throw an error */
     printf("OBJECT %x NOT FOUND.... THIS SHOULD NOT HAPPEN...TERMINATE PROGRAM\n", oid);
-    exit(-1);
+    //    exit(-1);
   } else {
     printf("Error: in decoding the control value %d, %s, %d\n",control, __FILE__, __LINE__);
   }
@@ -1302,9 +1309,8 @@ int startRemoteThread(unsigned int oid, unsigned int mid)
 }
 
 //TODO: when reusing oids, make sure they are not already in use!
+static unsigned int id = 0xFFFFFFFF;
 unsigned int getNewOID(void) {
-	static unsigned int id = 0xFFFFFFFF;
-	
 	id += 2;
 	if (id > oidMax || id < oidMin)
 	{
diff --git a/Robust/src/Runtime/runtime.c b/Robust/src/Runtime/runtime.c
index 0bb81d2f..a5c78425 100644
--- a/Robust/src/Runtime/runtime.c
+++ b/Robust/src/Runtime/runtime.c
@@ -100,7 +100,6 @@ void CALL01(___System______printString____L___String___,struct ___String___ * __
 
 #ifdef DSTM
 void CALL00(___System______clearPrefetchCache____) {
-  clearObjStore();
   prehashClear();
 }
 #endif