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 45e8a9d6c438181bbc4443e64772bd187198881d..773325d17b60cc91b3885bcda153bcff348d69de 100644 (file)
--- a/Robust/src/Runtime/thread.h
+++ b/Robust/src/Runtime/thread.h
@@ -2,6 +2,7 @@
 #define THREAD_H
 #include "methodheaders.h"
 #include <pthread.h>
+#include "objtypes.h"
 
 extern int threadcount;
 extern pthread_mutex_t gclock;
@@ -11,13 +12,19 @@ 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 ATOMICLOCK if (pthread_mutex_trylock(&atomiclock)!=0) { \
+    stopforgc((struct garbagelist *) &___locals___);            \
+    pthread_mutex_lock(&atomiclock);                            \
+    restartaftergc();                                           \
+}
 
 #define ATOMICUNLOCK pthread_mutex_unlock(&atomiclock)
 #else
@@ -26,7 +33,7 @@ extern pthread_mutex_t atomiclock;
 #endif
 
 #if defined(THREADS)||defined(STM)
-void initthread(struct ___Thread___ * ___this___);
+void initthread(ThreadPtr ___this___);
 #endif
 #ifdef DSTM
 void initDSMthread(int *ptr);