Changes according to Brian's comments: remove static inline functions in multicorecac...

[IRC.git] / Robust / src / Runtime / thread.h

diff --git a/Robust/src/Runtime/thread.h b/Robust/src/Runtime/thread.h
index dc728ccaf3a06b2a96b59b267d537d720fd26548..773325d17b60cc91b3885bcda153bcff348d69de 100644 (file)
--- a/Robust/src/Runtime/thread.h
+++ b/Robust/src/Runtime/thread.h
@@ -1,12 +1,43 @@
 #ifndef THREAD_H
 #define THREAD_H
 #include "methodheaders.h"
-#include "pthread.h"
+#include <pthread.h>
+#include "objtypes.h"
 
-extern pthread_mutex_t threadtable;
 extern int threadcount;
 extern pthread_mutex_t gclock;
 extern pthread_mutex_t gclistlock;
 extern pthread_cond_t gccond;
-void initthread(struct ___Thread___ * ___this___);
+extern pthread_mutex_t objlock;
+extern pthread_cond_t objcond;
+extern pthread_key_t threadlocks;
+extern pthread_mutex_t atomiclock;
+#ifdef MAC
+extern pthread_key_t litemkey;
+extern pthread_key_t macthreadid;
+extern pthread_key_t memorybasekey;
+extern pthread_key_t memorytopkey;
+#endif
+
+#ifdef PRECISE_GC
+#define ATOMICLOCK if (pthread_mutex_trylock(&atomiclock)!=0) { \
+    stopforgc((struct garbagelist *) &___locals___);            \
+    pthread_mutex_lock(&atomiclock);                            \
+    restartaftergc();                                           \
+}
+
+#define ATOMICUNLOCK pthread_mutex_unlock(&atomiclock)
+#else
+#define ATOMICLOCK pthread_mutex_lock(&atomiclock)
+#define ATOMICUNLOCK pthread_mutex_unlock(&atomiclock)
+#endif
+
+#if defined(THREADS)||defined(STM)
+void initthread(ThreadPtr ___this___);
+#endif
+#ifdef DSTM
+void initDSMthread(int *ptr);
+void startDSMthread(int oid, int objType);
+extern void * virtualtable[];
+#endif
 #endif