GNU header update.

[cacao.git] / src / native / vm / VMThread.c

diff --git a/src/native/vm/VMThread.c b/src/native/vm/VMThread.c
index dc36dde8d01d7aa564b5b5f54f6d4bd4b47d8bb2..dd179e82dc479d89caadc50da153297d49b0bcb2 100644 (file)
--- a/src/native/vm/VMThread.c
+++ b/src/native/vm/VMThread.c
@@ -1,9 +1,9 @@
-/* nat/Thread.c - java/lang/Thread
+/* native/vm/VMThread.c - java/lang/VMThread
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
-   M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
-   P. Tomsich, J. Wenninger
+   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
 
    This file is part of CACAO.
 
@@ -28,25 +28,34 @@
 
    Changes: Joseph Wenninger
 
-   $Id: VMThread.c 1227 2004-06-30 19:29:35Z twisti $
+   $Id: VMThread.c 1735 2004-12-07 14:33:27Z twisti $
 
 */
 
 
-#include "jni.h"
-#include "builtin.h"
+#include "config.h"
 #include "types.h"
-#include "native.h"
-#include "loader.h"
-#include "options.h"
-#include "tables.h"
-#include "threads/thread.h"
+#include "native/jni.h"
+#include "native/native.h"
+#include "native/include/java_lang_ThreadGroup.h"
+#include "native/include/java_lang_Object.h"            /* java_lang_Thread.h */
+#include "native/include/java_lang_Throwable.h"         /* java_lang_Thread.h */
+#include "native/include/java_lang_VMThread.h"
+#include "native/include/java_lang_Thread.h"
+
+#if defined(USE_THREADS)
+# if defined(NATIVE_THREADS)
+#  include "threads/native/threads.h"
+# else
+#  include "threads/green/threads.h"
+# endif
+#endif
+
 #include "toolbox/logging.h"
-#include "java_lang_ThreadGroup.h"
-#include "java_lang_Object.h"         /* needed for java_lang_Thread.h */
-#include "java_lang_Throwable.h"      /* needed for java_lang_Thread.h */
-#include "java_lang_VMThread.h"
-#include "java_lang_Thread.h"
+#include "vm/builtin.h"
+#include "vm/exceptions.h"
+#include "vm/options.h"
+#include "vm/tables.h"
 
 
 /*
@@ -77,7 +86,7 @@ JNIEXPORT java_lang_Thread* JNICALL Java_java_lang_VMThread_currentThread(JNIEnv
 #if !defined(NATIVE_THREADS)
        t = (java_lang_Thread *) currentThread;
 #else
-       t = THREADOBJECT;
+       t = ((threadobject*) THREADOBJECT)->o.thread;
 #endif
   
        if (!t->group) {
@@ -91,7 +100,7 @@ JNIEXPORT java_lang_Thread* JNICALL Java_java_lang_VMThread_currentThread(JNIEnv
                        log_text("unable to create ThreadGroup");
        }
 
-       return (java_lang_Thread *) t;
+       return t;
 #else
        return 0;       
 #endif
@@ -105,7 +114,11 @@ JNIEXPORT java_lang_Thread* JNICALL Java_java_lang_VMThread_currentThread(JNIEnv
  */
 JNIEXPORT void JNICALL Java_java_lang_VMThread_interrupt(JNIEnv *env, java_lang_VMThread *this)
 {
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+       interruptThread(this);
+#else
        log_text("Java_java_lang_VMThread_interrupt0 called");
+#endif
 }
 
 
@@ -120,8 +133,17 @@ JNIEXPORT s4 JNICALL Java_java_lang_VMThread_isAlive(JNIEnv *env, java_lang_VMTh
                log_text("java_lang_VMThread_isAlive called");
 
 #if defined(USE_THREADS)
+#if !defined(NATIVE_THREADS)
        return aliveThread((thread *) this->thread);
+#else
+       /* This method is implemented in classpath. */
+       throw_cacao_exception_exit(string_java_lang_InternalError, "aliveThread");
 #endif
+#endif
+
+       /* keep compiler happy */
+
+       return 0;
 }
 
 
@@ -133,8 +155,12 @@ JNIEXPORT s4 JNICALL Java_java_lang_VMThread_isAlive(JNIEnv *env, java_lang_VMTh
  */
 JNIEXPORT s4 JNICALL Java_java_lang_VMThread_isInterrupted(JNIEnv *env, java_lang_VMThread *this)
 {
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+       return isInterruptedThread(this);
+#else
        log_text("Java_java_lang_VMThread_isInterrupted  called");
        return 0;
+#endif
 }
 
 
@@ -175,7 +201,7 @@ JNIEXPORT void JNICALL Java_java_lang_VMThread_nativeSetPriority(JNIEnv *env, ja
     if (runverbose) 
                log_text("java_lang_VMThread_setPriority0 called");
 
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
+#if defined(USE_THREADS)
        setPriorityThread((thread *) this->thread, par1);
 #endif
 }
@@ -188,22 +214,6 @@ JNIEXPORT void JNICALL Java_java_lang_VMThread_nativeSetPriority(JNIEnv *env, ja
  */
 JNIEXPORT void JNICALL Java_java_lang_VMThread_sleep(JNIEnv *env, jclass clazz, s8 millis, s4 nanos)
 {
-       if (millis < 0) {
-               *exceptionptr =
-                       new_exception_message(string_java_lang_IllegalArgumentException,
-                                                                 "timeout value is negative");
-
-               return;
-       }
-
-       if (nanos < 0 || nanos > 999999) {
-               *exceptionptr =
-                       new_exception_message(string_java_lang_IllegalArgumentException,
-                                                                 "nanosecond timeout value out of range");
-
-               return;
-       }
-
 #if defined(USE_THREADS)
        sleepThread(millis, nanos);
 #endif
@@ -221,13 +231,8 @@ JNIEXPORT void JNICALL Java_java_lang_VMThread_start(JNIEnv *env, java_lang_VMTh
                log_text("java_lang_VMThread_start called");
 
 #if defined(USE_THREADS)
-#if defined(__GNUC__)
-#warning perhaps it would be better to always work with the vmthread structure in the thread code (jowenn)
-#endif
-       if (this->thread->vmThread == 0)
-               this->thread->vmThread = this;
-
-       startThread((thread *) (this->thread));
+       this->thread->vmThread = this;
+       startThread((thread *) this->thread);
 #endif
 }
 
@@ -299,9 +304,12 @@ JNIEXPORT void JNICALL Java_java_lang_VMThread_yield(JNIEnv *env, jclass clazz)
  */
 JNIEXPORT s4 JNICALL Java_java_lang_VMThread_interrupted(JNIEnv *env, jclass clazz)
 {
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+       return interruptedThread();
+#else
        log_text("Java_java_lang_VMThread_interrupted");
-
        return 0;
+#endif
 }
 
 
@@ -317,20 +325,25 @@ JNIEXPORT void JNICALL Java_java_lang_VMThread_nativeInit(JNIEnv *env, java_lang
                log_text("There has been an exception, strange...");*/
 
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       initThread(this->thread);
+       initThread(this);
 #endif
-       this->thread->priority = 5;
 }
 
 
 /*
- * Class:     java_lang_Thread
+ * Class:     java/lang/VMThread
  * Method:    holdsLock
  * Signature: (Ljava/lang/Object;)Z
  */
-JNIEXPORT s4 JNICALL Java_java_lang_VMThread_holdsLock(JNIEnv *env, jclass clazz, java_lang_Object *par1)
+JNIEXPORT s4 JNICALL Java_java_lang_VMThread_holdsLock(JNIEnv *env, jclass clazz, java_lang_Object* o)
 {
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+       return threadHoldsLock((threadobject*) THREADOBJECT,
+                                                  (java_objectheader *) o);
+#else
+       /* I don't know how to find out [stefan] */
        return 0;
+#endif
 }