* Removed vm/tables.h include.

[cacao.git] / src / threads / native / threads.h

diff --git a/src/threads/native/threads.h b/src/threads/native/threads.h
index 0020d806fc94530d76037b7b71d898227f30e22b..4dade8c93473343a5a138727dc0c9eaf95896820 100644 (file)
--- a/src/threads/native/threads.h
+++ b/src/threads/native/threads.h
@@ -1,4 +1,4 @@
-/* threads/native/threads.h - native threads header
+/* src/threads/native/threads.h - native threads header
 
    Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
    R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
@@ -26,7 +26,9 @@
 
    Authors: Stefan Ring
 
-   $Id: threads.h 1735 2004-12-07 14:33:27Z twisti $
+   Changes: Christian Thalinger
+
+   $Id: threads.h 3830 2005-12-01 23:07:33Z twisti $
 
 */
 
@@ -34,13 +36,22 @@
 #ifndef _THREADS_H
 #define _THREADS_H
 
+#include <pthread.h>
 #include <semaphore.h>
+#include <ucontext.h>
+
+#include "config.h"
+#include "vm/types.h"
+
+#include "config.h"
+#include "vm/types.h"
 
 #include "mm/memory.h"
 #include "native/jni.h"
 #include "native/include/java_lang_Object.h" /* required by java/lang/VMThread*/
 #include "native/include/java_lang_Thread.h"
 #include "native/include/java_lang_VMThread.h"
+#include "vm/global.h"
 
 #if defined(__DARWIN__)
 #include <mach/mach.h>
@@ -50,6 +61,25 @@
 #endif
 
 
+#if defined(HAVE___THREAD)
+
+#define THREADSPECIFIC    __thread
+#define THREADOBJECT      ((java_lang_VMThread*) threadobj)
+#define THREADINFO        (&threadobj->info)
+
+extern __thread threadobject *threadobj;
+
+#else /* defined(HAVE___THREAD) */
+
+#define THREADSPECIFIC
+#define THREADOBJECT ((java_lang_VMThread*) pthread_getspecific(tkey_threadinfo))
+#define THREADINFO (&((threadobject*) pthread_getspecific(tkey_threadinfo))->info)
+
+extern pthread_key_t tkey_threadinfo;
+
+#endif /* defined(HAVE___THREAD) */
+
+
 /* typedefs *******************************************************************/
 
 typedef struct ExecEnvironment ExecEnvironment;
@@ -78,8 +108,11 @@ struct nativethread {
        threadobject      *next;
        threadobject      *prev;
        java_objectheader *_exceptionptr;
-       methodinfo        *_threadrootmethod;
        void              *_stackframeinfo;
+       localref_table    *_localref_table; /* JNI local references               */
+#if defined(ENABLE_INTRP)
+       void              *_global_sp;
+#endif
        pthread_t          tid;
 #if defined(__DARWIN__)
        mach_port_t        mach_thread;
@@ -91,15 +124,16 @@ struct nativethread {
 
 /* threadobject ****************************************************************
 
-   DOCUMENT ME!
+   Every java.lang.VMThread object is actually an instance of this structure.
 
 *******************************************************************************/
 
 struct threadobject {
        java_lang_VMThread  o;
-       nativethread        info;
-       ExecEnvironment     ee;
+       nativethread        info;           /* some general pthreads stuff        */
+       ExecEnvironment     ee;             /* contains our lock record pool      */
 
+       /* these are used for the wait/notify implementation                      */
        pthread_mutex_t     waitLock;
        pthread_cond_t      waitCond;
        bool                interrupted;
@@ -109,13 +143,19 @@ struct threadobject {
        dumpinfo            dumpinfo;       /* dump memory info structure         */
 };
 
+/* monitorLockRecord ***********************************************************
+
+   This is the really interesting stuff.
+   See handbook for a detailed description.
+
+*******************************************************************************/
 
 struct monitorLockRecord {
        threadobject      *ownerThread;
        java_objectheader *o;
-       int                lockCount;
+       s4                 lockCount;
        monitorLockRecord *nextFree;
-       int                queuers;
+       s4                 queuers;
        monitorLockRecord *waiter;
        monitorLockRecord *incharge;
        bool               waiting;
@@ -125,7 +165,6 @@ struct monitorLockRecord {
 };
 
 
-
 struct lockRecordPoolHeader {
        lockRecordPool *next;
        int             size;
@@ -141,16 +180,23 @@ monitorLockRecord *monitorEnter(threadobject *, java_objectheader *);
 bool monitorExit(threadobject *, java_objectheader *);
 
 bool threadHoldsLock(threadobject *t, java_objectheader *o);
-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, s4 nanos);
+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, s4 nanos);
+
+void *thread_getself(void);
+
+void threads_preinit(void);
+bool threads_init(u1 *stackbottom);
 
-void initThreadsEarly();
-void initThreads(u1 *stackbottom);
 void initObjectLock(java_objectheader *);
+monitorLockRecord *get_dummyLR(void);
 void initLocks();
 void initThread(java_lang_VMThread *);
-void startThread(thread *t);
+
+/* start a thread */
+void threads_start_thread(thread *t, functionptr function);
+
 void joinAllThreads();
 
 void sleepThread(s8 millis, s4 nanos);
@@ -162,17 +208,6 @@ 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_VMThread*) pthread_getspecific(tkey_threadinfo))
-#define THREADINFO (&((threadobject*) pthread_getspecific(tkey_threadinfo))->info)
-#else
-extern __thread threadobject *threadobj;
-#define THREADOBJECT ((java_lang_VMThread*) threadobj)
-#define THREADINFO (&threadobj->info)
-#endif
-
-
 /* This must not be changed, it is used in asm_criticalsections */
 typedef struct {
        u1 *mcodebegin;
@@ -184,10 +219,21 @@ void thread_registercritical(threadcritnode *);
 u1 *thread_checkcritical(u1*);
 
 extern volatile int stopworldwhere;
+extern threadobject *mainthreadobj;
+
+extern pthread_mutex_t pool_lock;
+extern lockRecordPool *global_pool;
+
 
 void cast_stopworld();
 void cast_startworld();
 
+/* dumps all threads */
+void threads_dump(void);
+
+/* this is a machine dependent functions (src/vm/jit/$(ARCH_DIR)/md.c) */
+void thread_restartcriticalsection(ucontext_t *);
+
 #endif /* _THREADS_H */