From: jjenista <jjenista>
Date: Tue, 9 Nov 2010 02:28:26 +0000 (+0000)
Subject: pruning unneeded fields
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=bcaf6ece5ffd064610dc77b8e7bc5dcc9ee59bf5;p=IRC.git

pruning unneeded fields
---

diff --git a/Robust/src/Runtime/mlp_runtime.c b/Robust/src/Runtime/mlp_runtime.c
index b7b458c8..5dcf2b97 100644
--- a/Robust/src/Runtime/mlp_runtime.c
+++ b/Robust/src/Runtime/mlp_runtime.c
@@ -829,7 +829,7 @@ void resolveDependencies(REntry* rentry){
     }
   } else if (type==PARENTCOARSE) {
     if (atomic_sub_and_test(1, &(seseCommon->unresolvedDependencies))) {
-      psem_give_tag(rentry->parentStallSem, rentry->tag);
+      psem_give_tag(seseCommon->parentsStallSem, ((SESEstall *) seseCommon)->tag);
       //release our reference to stallrecord
 #ifndef OOO_DISABLE_TASKMEMPOOL
       RELEASE_REFERENCE_TO(seseCommon);
diff --git a/Robust/src/Runtime/mlp_runtime.h b/Robust/src/Runtime/mlp_runtime.h
index b52bb569..2d51ac97 100644
--- a/Robust/src/Runtime/mlp_runtime.h
+++ b/Robust/src/Runtime/mlp_runtime.h
@@ -148,17 +148,18 @@ typedef struct REntry_t{
   // fine read:0, fine write:1, parent read:2, 
   // parent write:3 coarse: 4, parent coarse:5, scc: 6
   int type;
-  int tag;
+  int isBufMode;
   struct MemoryQueueItem_t *qitem;
   struct BinItem_t* binitem;
   struct MemoryQueue_t* queue;
   SESEcommon* seseRec;
   INTPTR* pointer;
-  psemaphore * parentStallSem;
 #ifdef RCR
   INTPTR mask;
+#else
+  psemaphore * parentStallSem;
+  int tag;
 #endif
-  int isBufMode;
 } REntry;
 
 #ifdef RCR
@@ -308,13 +309,11 @@ static inline int RELEASE_REFERENCE_TO( SESEcommon* seseRec ) {
 
 #define RELEASE_REFERENCE_TOx(x) if (atomic_sub_and_test(1, &((x)->refCount))) {poolfreeinto(x->parent->taskRecordMemPool, x);printf("0x%x REL 0x%x on %d\n",(INTPTR)runningSESE,(INTPTR)(x),__LINE__);}
 
-#define CHECK_RECORDx(x) { \
-  if( ((SESEcommon*)(x))->refCount != 0 ) {                             \
-    printf( "Acquired 0x%x from poolalloc, with refCount=%d\n", (INTPTR)(x), ((SESEcommon*)(x))->refCount ); } \
-  if( ((SESEcommon*)(x))->fresh != 1 ) {                              \
-    printf("0x%x reclaimed 0x%x on %d\n",(INTPTR)runningSESE,(INTPTR)(x),__LINE__); } \
-  ((SESEcommon*)(x))->fresh = 0; \
-}
+#define CHECK_RECORDx(x) {                                              \
+    if( ((SESEcommon*)(x))->refCount < 0 ||                             \
+        ((SESEcommon*)(x))->refCount < 0 ) {                            \
+      printf( "Acquired 0x%x from poolalloc, with refCount=%d\n", (INTPTR)(x), ((SESEcommon*)(x))->refCount ); } \
+  }