* src/threads/native/threads.h: waiting is correctly typed now (previous checkin...

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

diff --git a/src/threads/native/threads.h b/src/threads/native/threads.h
index 7ef928ceb8d8104c180670296e1b66ccdbd27e83..e6857f10c9783c0e371279a9fea5e23c829c78ab 100644 (file)
--- a/src/threads/native/threads.h
+++ b/src/threads/native/threads.h
@@ -1,9 +1,9 @@
 /* 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,
-   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
-   Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
+   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
+   J. Wenninger, Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
@@ -19,16 +19,16 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+   Contact: cacao@cacaojvm.org
 
    Authors: Stefan Ring
 
    Changes: Christian Thalinger
 
-   $Id: threads.h 3249 2005-09-21 15:32:47Z twisti $
+   $Id: threads.h 4444 2006-02-05 13:52:26Z stefan $
 
 */
 
@@ -36,14 +36,23 @@
 #ifndef _THREADS_H
 #define _THREADS_H
 
+#include "config.h"
+
 #include <pthread.h>
 #include <semaphore.h>
+#include <ucontext.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>
@@ -56,7 +65,7 @@
 #if defined(HAVE___THREAD)
 
 #define THREADSPECIFIC    __thread
-#define THREADOBJECT      ((java_lang_VMThread*) threadobj)
+#define THREADOBJECT      threadobj
 #define THREADINFO        (&threadobj->info)
 
 extern __thread threadobject *threadobj;
@@ -64,8 +73,8 @@ 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)
+#define THREADOBJECT      pthread_getspecific(tkey_threadinfo)
+#define THREADINFO        (&((threadobject*) pthread_getspecific(tkey_threadinfo))->info)
 
 extern pthread_key_t tkey_threadinfo;
 
@@ -100,11 +109,10 @@ struct nativethread {
        threadobject      *next;
        threadobject      *prev;
        java_objectheader *_exceptionptr;
-       u1                 _dontfillinexceptionstacktrace;
-       methodinfo        *_threadrootmethod;
        void              *_stackframeinfo;
+       localref_table    *_localref_table; /* JNI local references               */
 #if defined(ENABLE_INTRP)
-       void               *_global_sp;
+       void              *_global_sp;
 #endif
        pthread_t          tid;
 #if defined(__DARWIN__)
@@ -117,7 +125,8 @@ struct nativethread {
 
 /* threadobject ****************************************************************
 
-   Every java.lang.VMThread object is actually an instance of this structure.
+   Every java.lang.VMThread object is actually an instance of this
+   structure.
 
 *******************************************************************************/
 
@@ -146,12 +155,12 @@ struct threadobject {
 struct monitorLockRecord {
        threadobject      *ownerThread;
        java_objectheader *o;
-       int                lockCount;
+       s4                 lockCount;
        monitorLockRecord *nextFree;
-       int                queuers;
+       s4                 queuers;
        monitorLockRecord *waiter;
        monitorLockRecord *incharge;
-       bool               waiting;
+       java_objectheader *waiting;
        sem_t              queueSem;
        pthread_mutex_t    resolveLock;
        pthread_cond_t     resolveWait;
@@ -173,19 +182,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 initThreadsEarly();
-void initThreads(u1 *stackbottom);
+void threads_preinit(void);
+bool threads_init(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);
@@ -210,12 +223,18 @@ 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 thread_dump(void);
+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 */