From: bdemsky <bdemsky>
Date: Wed, 6 Aug 2008 05:33:35 +0000 (+0000)
Subject: New strategy...  If the prefetching thread gets behind us, we don't issue a prefetch.
X-Git-Tag: preEdgeChange~24
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=ceb4450e2b484765f9d7c223a98b9698f4e522b7;p=IRC.git

New strategy...  If the prefetching thread gets behind us, we don't issue a prefetch.
---

diff --git a/Robust/src/Runtime/DSTM/interface/queue.c b/Robust/src/Runtime/DSTM/interface/queue.c
index 9f2eb419..9ff96430 100644
--- a/Robust/src/Runtime/DSTM/interface/queue.c
+++ b/Robust/src/Runtime/DSTM/interface/queue.c
@@ -25,17 +25,17 @@ void * getmemory(int size) {
   if (tmpoffset>QSIZE) {
     //Wait for tail to go past end
     tmpoffset=size+sizeof(int);
-    while(headoffset<tailoffset)
-      ;
+    if (headoffset<tailoffset)
+      return NULL;
     //Wait for tail to go past new start
-    while(tailoffset<=tmpoffset)
-      ;
+    if (tailoffset<=tmpoffset)
+      return NULL;
     *((int *)(memory+headoffset))=-1;//safe because we left space
     *((int*)memory)=size+sizeof(int);
     return memory+sizeof(int);
   } else {
-    while(headoffset<tailoffset&&tailoffset<=tmpoffset)
-      ;
+    if (headoffset<tailoffset&&tailoffset<=tmpoffset)
+      return NULL;
     *((int*)(memory+headoffset))=size+sizeof(int);
     return memory+headoffset+sizeof(int);
   }
diff --git a/Robust/src/Runtime/DSTM/interface/trans.c b/Robust/src/Runtime/DSTM/interface/trans.c
index 242e6bce..04dc63ce 100644
--- a/Robust/src/Runtime/DSTM/interface/trans.c
+++ b/Robust/src/Runtime/DSTM/interface/trans.c
@@ -143,10 +143,13 @@ inline int findmax(int *array, int arraylength) {
 void prefetch(int siteid, int ntuples, unsigned int *oids, unsigned short *endoffsets, short *arrayfields) {
   /* Allocate for the queue node*/
   int qnodesize = 2*sizeof(int) + ntuples * (sizeof(unsigned short) + sizeof(unsigned int)) + endoffsets[ntuples - 1] * sizeof(short);
-  char * node= getmemory(qnodesize);
-  /* Set queue node values */
   int len;
+  char * node= getmemory(qnodesize);
   int top=endoffsets[ntuples-1];
+  
+  if (node==NULL) 
+    return;
+  /* Set queue node values */
 
   /* TODO: Remove this after testing */
   evalPrefetch[siteid].callcount++;