From: bdemsky <bdemsky>
Date: Sat, 16 Apr 2011 00:10:35 +0000 (+0000)
Subject: add enqueue to garbage.h
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=31b68fba31ac5aa90a12f2616f9264922d8a3e4f;p=IRC.git

add enqueue to garbage.h
---

diff --git a/Robust/src/Runtime/garbage.h b/Robust/src/Runtime/garbage.h
index 8d82ea12..a2a1f629 100644
--- a/Robust/src/Runtime/garbage.h
+++ b/Robust/src/Runtime/garbage.h
@@ -14,6 +14,49 @@ struct pointerblock {
   struct pointerblock *next;
 };
 
+//Need to check if pointers are transaction pointers
+//this also catches the special flag value of 1 for local copies
+#ifdef DSTM
+#define ENQUEUE(orig, dst) \
+  if ((!(((unsigned int)orig)&0x1))) { \
+    if (orig>=curr_heapbase&&orig<curr_heaptop) { \
+      void *copy; \
+      if (gc_createcopy(orig,&copy)) \
+	enqueue(copy);\
+      dst=copy; \
+    } \
+  }
+#elif defined(STM)
+#define ENQUEUE(orig, dst) \
+  if (orig>=curr_heapbase&&orig<curr_heaptop) { \
+    void *copy; \
+    if (gc_createcopy(orig,&copy)) \
+      enqueue(copy);\
+    dst=copy; \
+  }
+#define SENQUEUE(orig, dst) \
+  { \
+    void *copy; \
+    if (gc_createcopy(orig,&copy)) \
+      enqueue(copy);\
+    dst=copy; \
+  }
+#elif defined(FASTCHECK)
+#define ENQUEUE(orig, dst) \
+  if (((unsigned int)orig)!=1) { \
+    void *copy; \
+    if (gc_createcopy(orig,&copy)) \
+      enqueue(copy);\
+    dst=copy; }
+#else
+#define ENQUEUE(orig, dst) \
+  if (orig!=NULL) { \
+    void *copy; \
+    if (gc_createcopy(orig,&copy)) \
+      enqueue(copy); \
+    dst=copy; \
+  }
+#endif
 
 struct garbagelist {  
   int size;