X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Robust%2Fsrc%2FRuntime%2Fruntime.h;h=bea53a5b44479b07d5c6e83a9160993721e94440;hb=43ca28489f56813a8184ff602bb8e8f0e507c40c;hp=844039e642734afce41f58288c4d48ab5130c33c;hpb=b0a3fca785f72dc0a4bd45004e8d90c907162b6f;p=IRC.git

diff --git a/Robust/src/Runtime/runtime.h b/Robust/src/Runtime/runtime.h
index 844039e6..bea53a5b 100644
--- a/Robust/src/Runtime/runtime.h
+++ b/Robust/src/Runtime/runtime.h
@@ -1,21 +1,71 @@
 #ifndef RUNTIME
 #define RUNTIME
+#ifndef MULTICORE
 #include <setjmp.h>
 extern jmp_buf error_handler;
 extern int instructioncount;
 extern int failurecount;
+#endif
+#ifdef DSTM
+#include "dstm.h"
+#endif
+
+#ifndef INTPTR
+#ifdef BIT64
+#define INTPTR long
+#else
+#define INTPTR int
+#endif
+#endif
+
+extern void * curr_heapbase;
+extern void * curr_heaptop;
+
+#define TAGARRAYINTERVAL 10
+#define OBJECTARRAYINTERVAL 10
+
+#define ARRAYSET(array, type, index, value) \
+  ((type *)(& (& array->___length___)[1]))[index]=value
+
+#define ARRAYGET(array, type, index) \
+  ((type *)(& (& array->___length___)[1]))[index]
+
+#ifdef OPTIONAL
+#define OPTARG(x) , x
+#else
+#define OPTARG(x)
+#endif
+
+#ifdef DSTM
+__attribute__((malloc)) void * allocate_newglobal(int type);
+__attribute__((malloc)) struct ArrayObject * allocate_newarrayglobal(int type, int length);
+#endif
+
+#ifdef STM
+__attribute__((malloc)) void * allocate_newtrans(void * ptr, int type);
+__attribute__((malloc)) struct ArrayObject * allocate_newarraytrans(void * ptr, int type, int length);
+#endif
 
 #ifdef PRECISE_GC
 #include "garbage.h"
-void * allocate_new(void *, int type);
-struct ArrayObject * allocate_newarray(void *, int type, int length);
-struct ___String___ * NewString(void *, const char *str,int length);
+__attribute__((malloc)) void * allocate_new(void *, int type);
+__attribute__((malloc)) struct ArrayObject * allocate_newarray(void *, int type, int length);
+__attribute__((malloc)) struct ___String___ * NewString(void *, const char *str,int length);
+__attribute__((malloc)) struct ___TagDescriptor___ * allocate_tag(void *ptr, int index);
+#elif defined MULTICORE_GC
+__attribute__((malloc)) void * allocate_new(void *, int type);
+__attribute__((malloc)) struct ArrayObject * allocate_newarray(void *, int type, int length);
+__attribute__((malloc)) struct ___String___ * NewString(void *, const char *str,int length);
+__attribute__((malloc)) struct ___TagDescriptor___ * allocate_tag(void *ptr, int index);
 #else
-void * allocate_new(int type);
-struct ArrayObject * allocate_newarray(int type, int length);
-struct ___String___ * NewString(const char *str,int length);
+__attribute__((malloc)) void * allocate_new(int type);
+__attribute__((malloc)) struct ArrayObject * allocate_newarray(int type, int length);
+__attribute__((malloc)) struct ___String___ * NewString(const char *str,int length);
+__attribute__((malloc)) struct ___TagDescriptor___ * allocate_tag(int index);
 #endif
 
+
+
 void initializeexithandler();
 void failedboundschk();
 void failednullptr();
@@ -30,8 +80,10 @@ void createstartupobject();
 #define CALL02(name, alt1, alt2) name(struct name ## _params * ___params___)
 #define CALL11(name,rest, alt) name(struct name ## _params * ___params___, rest)
 #define CALL12(name,rest, alt1, alt2) name(struct name ## _params * ___params___, rest)
+#define CALL22(name, rest, rest2, alt1, alt2) name(struct name ## _params * ___params___, rest, rest2)
 #define CALL23(name, rest, rest2, alt1, alt2, alt3) name(struct name ## _params * ___params___, rest, rest2)
 #define CALL24(name, rest, rest2, alt1, alt2, alt3, alt4) name(struct name ## _params * ___params___, rest, rest2)
+#define CALL34(name, rest, rest2, rest3, alt1, alt2, alt3, alt4) name(struct name ## _params * ___params___, rest, rest2, rest3)
 #else
 #define VAR(name) name
 #define CALL00(name) name()
@@ -39,24 +91,76 @@ void createstartupobject();
 #define CALL02(name, alt1, alt2) name(alt1, alt2)
 #define CALL11(name,rest, alt) name(alt)
 #define CALL12(name,rest, alt1, alt2) name(alt1, alt2)
+#define CALL22(name, rest, rest2, alt1, alt2) name(alt1, alt2)
 #define CALL23(name, rest, rest2, alt1, alt2, alt3) name(alt1, alt2, alt3)
 #define CALL24(name, rest, rest2, alt1, alt2, alt3, alt4) name(alt1, alt2, alt3, alt4)
+#define CALL34(name, rest, rest2, rest3, alt1, alt2, alt3, alt4) name(alt1, alt2, alt3, alt4)
 #endif
 
 #ifdef TASK
 #include "SimpleHash.h"
-#include "task.h"
+#ifndef MULTICORE
+#include "chash.h"
+#include "ObjectHash.h"
 #include "structdefs.h"
+#endif
+#include "task.h"
+#ifdef OPTIONAL
+#include "optionalstruct.h"
+#endif
+
+#ifdef OPTIONAL
+struct failedtasklist {
+  struct taskdescriptor *task;
+  int index;
+  int numflags;
+  int *flags;
+  struct failedtasklist *next;
+};
+#endif
+
+#ifdef MULTICORE
+struct transObjInfo {
+  void * objptr;
+  int targetcore;
+  int * queues;
+  int length;
+};
+#endif
 
+#ifdef FASTCHECK
+extern struct ___Object___ * ___fcrevert___;
+#endif
+
+#ifdef MULTICORE
+inline void run(void * arg);
+int receiveObject(void);
+void flagorand(void * ptr, int ormask, int andmask, struct parameterwrapper ** queues, int length);
+void flagorandinit(void * ptr, int ormask, int andmask);
+void enqueueObject(void * ptr, struct parameterwrapper ** queues, int length);
+#ifdef PROFILE
+inline void setTaskExitIndex(int index);
+inline void addNewObjInfo(void * nobj);
+#endif
+int * getAliasLock(void ** ptrs, int length, struct RuntimeHash * tbl);
+void addAliasLock(void * ptr, int lock);
+void * smemalloc(int size, int * allocsize);
+#else
 void flagorand(void * ptr, int ormask, int andmask);
 void flagorandinit(void * ptr, int ormask, int andmask);
+void enqueueObject(void * ptr);
+#endif
 void executetasks();
 void processtasks();
 
+#ifndef MULTICORE
 struct tagobjectiterator {
   int istag; /* 0 if object iterator, 1 if tag iterator */
-  struct RuntimeIterator it; /* Object iterator */
-  struct RuntimeHash * objectset;
+  struct ObjectIterator it; /* Object iterator */
+  struct ObjectHash * objectset;
+#ifdef OPTIONAL
+  int failedstate;
+#endif
   int slot;
   int tagobjindex; /* Index for tag or object depending on use */
   /*if tag we have an object binding */
@@ -69,7 +173,7 @@ struct tagobjectiterator {
 
 struct parameterwrapper {
   struct parameterwrapper *next;
-  struct RuntimeHash * objectset;
+  struct ObjectHash * objectset;
   int numberofterms;
   int * intarray;
   int numbertags;
@@ -78,23 +182,27 @@ struct parameterwrapper {
   int slot;
   struct tagobjectiterator iterators[MAXTASKPARAMS-1];
 };
+#endif
 
 struct taskparamdescriptor {
   struct taskdescriptor * task;
   int numParameters;
   void ** parameterArray;
+#ifdef OPTIONAL
+  int * failed;
+#endif
 };
 
 int hashCodetpd(struct taskparamdescriptor *);
 int comparetpd(struct taskparamdescriptor *, struct taskparamdescriptor *);
 
 void toiReset(struct tagobjectiterator * it);
-int toiHasNext(struct tagobjectiterator *it, void ** objectarray);
-void toiNext(struct tagobjectiterator *it , void ** objectarray);
+int toiHasNext(struct tagobjectiterator *it, void ** objectarray OPTARG(int * failed));
+void toiNext(struct tagobjectiterator *it, void ** objectarray OPTARG(int * failed));
 void processobject(struct parameterwrapper *parameter, int index, struct parameterdescriptor *pd, int *iteratorcount, int * statusarray, int numparams);
 void processtags(struct parameterdescriptor *pd, int index, struct parameterwrapper *parameter, int * iteratorcount, int *statusarray, int numparams);
 void builditerators(struct taskdescriptor * task, int index, struct parameterwrapper * parameter);
-void enqueuetasks(struct parameterwrapper *parameter, struct parameterwrapper *prevptr, struct ___Object___ *ptr);
+int enqueuetasks(struct parameterwrapper *parameter, struct parameterwrapper *prevptr, struct ___Object___ *ptr, int * enterflags, int numenterflags);
 
 #endif