We do not use c++, so omit -fexceptions.

[cacao.git] / threads / nativethread.h

diff --git a/threads/nativethread.h b/threads/nativethread.h
index b95b1bf4aca395e16119da5e55904cd049030d16..1766c98ec3f263551a2f6de320f2a17b7338e390 100644 (file)
--- a/threads/nativethread.h
+++ b/threads/nativethread.h
@@ -1,19 +1,35 @@
 #ifndef _NATIVETHREAD_H
 #define _NATIVETHREAD_H
 
+#include <semaphore.h>
+
 #include "jni.h"
 #include "nat/java_lang_Object.h"
 #include "nat/java_lang_Throwable.h"
 #include "nat/java_lang_Thread.h"
+#include "nat/java_lang_VMThread.h"
+#include "toolbox/memory.h"
+
+#if defined(__DARWIN__)
+#include <mach/mach.h>
+
+/* We need to emulate recursive mutexes. */
+#define MUTEXSIM
+#endif
 
 struct _threadobject;
 
-typedef struct monitorLockRecord {
-       struct _threadobject *owner;
+typedef struct _monitorLockRecord {
+       struct _threadobject *ownerThread;
+       java_objectheader *o;
        int lockCount;
-       long storedBits;
-       struct monitorLockRecord *queue;
-       struct monitorLockRecord *nextFree;
+       struct _monitorLockRecord *nextFree;
+       int queuers;
+       struct _monitorLockRecord *waiter, *incharge;
+       bool waiting;
+       sem_t queueSem;
+       pthread_mutex_t resolveLock;
+       pthread_cond_t resolveWait;
 } monitorLockRecord;
 
 struct _lockRecordPool;
@@ -28,23 +44,11 @@ typedef struct _lockRecordPool {
        monitorLockRecord lr[1];
 } lockRecordPool;
 
-#define INITIALLOCKRECORDS 8
-
 /* Monitor lock implementation */
 typedef struct {
-       pthread_mutex_t metaLockMutex;
-       pthread_cond_t metaLockCond;
-       bool gotMetaLockSlow;
-       bool bitsForGrab;
-       long metaLockBits;
-       struct _threadobject *succ;
-       pthread_mutex_t monitorLockMutex;
-       pthread_cond_t monitorLockCond;
-       bool isWaitingForNotify;
-
        monitorLockRecord *firstLR;
-       monitorLockRecord lr[INITIALLOCKRECORDS];
        lockRecordPool *lrpool;
+       int numlr;
 } ExecEnvironment;
 
 typedef struct {
@@ -53,52 +57,96 @@ typedef struct {
        methodinfo *_threadrootmethod;
        void *_stackframeinfo;
        pthread_t tid;
+#if defined(__DARWIN__)
+       mach_port_t mach_thread;
+#endif
        pthread_mutex_t joinMutex;
        pthread_cond_t joinCond;
 } nativethread;
 
+typedef java_lang_Thread thread;
+
+
+/* threadobject ****************************************************************
+
+   TODO
+
+*******************************************************************************/
+
 typedef struct _threadobject {
-       java_lang_Thread o;
-       nativethread info;
-       ExecEnvironment ee;
-} threadobject, thread;
+       java_lang_VMThread  o;
+       nativethread        info;
+       ExecEnvironment     ee;
+
+       pthread_mutex_t     waitLock;
+       pthread_cond_t      waitCond;
+       bool                interrupted;
+       bool                signaled;
+       bool                isSleeping;
+
+       dumpinfo            dumpinfo;       /* dump memory info structure         */
+} threadobject;
 
-void monitorEnter(threadobject *, java_objectheader *);
-void monitorExit(threadobject *, java_objectheader *);
 
+monitorLockRecord *monitorEnter(threadobject *, java_objectheader *);
+bool monitorExit(threadobject *, java_objectheader *);
+
+bool threadHoldsLock(threadobject *, java_objectheader *);
 void signal_cond_for_object (java_objectheader *obj);
 void broadcast_cond_for_object (java_objectheader *obj);
-void wait_cond_for_object (java_objectheader *obj, s8 time);
+void wait_cond_for_object (java_objectheader *obj, s8 time, s4 nanos);
 
 void initThreadsEarly();
 void initThreads(u1 *stackbottom);
+void initObjectLock(java_objectheader *);
 void initLocks();
-void initThread(java_lang_Thread *);
+void initThread(java_lang_VMThread *);
 void joinAllThreads();
 
-bool aliveThread(java_lang_Thread *);
-void sleepThread (s8);
+void sleepThread(s8 millis, s4 nanos);
 void yieldThread();
 
+void interruptThread(java_lang_VMThread *);
+bool interruptedThread();
+bool isInterruptedThread(java_lang_VMThread *);
+
 #if !defined(HAVE___THREAD)
 extern pthread_key_t tkey_threadinfo;
-#define THREADOBJECT ((java_lang_Thread*) pthread_getspecific(tkey_threadinfo))
+#define THREADOBJECT ((java_lang_VMThread*) pthread_getspecific(tkey_threadinfo))
 #define THREADINFO (&((threadobject*) pthread_getspecific(tkey_threadinfo))->info)
 #else
 extern __thread threadobject *threadobj;
-#define THREADOBJECT ((java_lang_Thread*) threadobj)
+#define THREADOBJECT ((java_lang_VMThread*) threadobj)
 #define THREADINFO (&threadobj->info)
 #endif
 
 #include "builtin.h"
 
+/* This must not be changed, it is used in asm_criticalsections */
 typedef struct {
-       u1 *mcodebegin, *mcodeend;
+       u1 *mcodebegin, *mcodeend, *mcoderestart;
 } threadcritnode;
 
 void thread_registercritical(threadcritnode *);
+u1 *thread_checkcritical(u1*);
 
 extern volatile int stopworldwhere;
 
+void cast_stopworld();
+void cast_startworld();
+
 #endif /* _NATIVETHREAD_H */
 
+
+/*
+ * These are local overrides for various environment variables in Emacs.
+ * Please do not remove this and leave it at the end of the file, where
+ * Emacs will automagically detect them.
+ * ---------------------------------------------------------------------
+ * Local variables:
+ * mode: c
+ * indent-tabs-mode: t
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ */