From: Michael Starzinger <michi@complang.tuwien.ac.at>
Date: Mon, 8 Oct 2007 13:12:45 +0000 (+0200)
Subject: * src/native/vm/cldc1.1/java_lang_Object.c
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=0ed8aae787a11a129e328ed23af73bcb57df8f1e;p=cacao.git

* src/native/vm/cldc1.1/java_lang_Object.c
(Java_java_lang_Object_notify): Adapted to new locking function signatures.
(Java_java_lang_Object_notifyAll): Likewise.
(Java_java_lang_Object_wait): Likewise.

* src/native/vm/gnu/java_lang_VMObject.c
(Java_java_lang_VMObject_notify): Adapted to new locking function signatures.
(Java_java_lang_VMObject_notifyAll): Likewise.
(Java_java_lang_VMObject_wait): Likewise.

* src/native/vm/sun/jvm.c
(JVM_MonitorWait): Adapted to new locking function signatures.
(JVM_MonitorNotify): Likewise.
(JVM_MonitorNotifyAll): Likewise.
---

diff --git a/src/native/vm/cldc1.1/java_lang_Object.c b/src/native/vm/cldc1.1/java_lang_Object.c
index 6d419c0dc..26808ea6e 100644
--- a/src/native/vm/cldc1.1/java_lang_Object.c
+++ b/src/native/vm/cldc1.1/java_lang_Object.c
@@ -115,9 +115,7 @@ JNIEXPORT int32_t JNICALL Java_java_lang_Object_hashCode(JNIEnv *env, java_lang_
 JNIEXPORT void JNICALL Java_java_lang_Object_notify(JNIEnv *env, java_lang_Object *this)
 {
 #if defined(ENABLE_THREADS)
-	LLNI_CRITICAL_START;
-	lock_notify_object((java_object_t *) LLNI_DIRECT(this));
-	LLNI_CRITICAL_END;
+	lock_notify_object((java_handle_t *) this);
 #endif
 }
 
@@ -130,9 +128,7 @@ JNIEXPORT void JNICALL Java_java_lang_Object_notify(JNIEnv *env, java_lang_Objec
 JNIEXPORT void JNICALL Java_java_lang_Object_notifyAll(JNIEnv *env, java_lang_Object *this)
 {
 #if defined(ENABLE_THREADS)
-	LLNI_CRITICAL_START;
-	lock_notify_all_object((java_object_t *) LLNI_DIRECT(this));
-	LLNI_CRITICAL_END;
+	lock_notify_all_object((java_handle_t *) this);
 #endif
 }
 
@@ -150,9 +146,7 @@ JNIEXPORT void JNICALL Java_java_lang_Object_wait(JNIEnv *env, java_lang_Object
 #endif
 
 #if defined(ENABLE_THREADS)
-	LLNI_CRITICAL_START;
-	lock_wait_for_object((java_object_t *) LLNI_DIRECT(this), timeout, 0);
-	LLNI_CRITICAL_END;
+	lock_wait_for_object((java_handle_t *) this, timeout, 0);
 #endif
 
 #if defined(ENABLE_JVMTI)
diff --git a/src/native/vm/gnu/java_lang_VMObject.c b/src/native/vm/gnu/java_lang_VMObject.c
index d49799e7b..ea0ba0e69 100644
--- a/src/native/vm/gnu/java_lang_VMObject.c
+++ b/src/native/vm/gnu/java_lang_VMObject.c
@@ -120,9 +120,7 @@ JNIEXPORT java_lang_Object* JNICALL Java_java_lang_VMObject_clone(JNIEnv *env, j
 JNIEXPORT void JNICALL Java_java_lang_VMObject_notify(JNIEnv *env, jclass clazz, java_lang_Object *this)
 {
 #if defined(ENABLE_THREADS)
-	LLNI_CRITICAL_START;
-	lock_notify_object((java_object_t *) LLNI_DIRECT(this));
-	LLNI_CRITICAL_END;
+	lock_notify_object((java_handle_t *) this);
 #endif
 }
 
@@ -135,9 +133,7 @@ JNIEXPORT void JNICALL Java_java_lang_VMObject_notify(JNIEnv *env, jclass clazz,
 JNIEXPORT void JNICALL Java_java_lang_VMObject_notifyAll(JNIEnv *env, jclass clazz, java_lang_Object *this)
 {
 #if defined(ENABLE_THREADS)
-	LLNI_CRITICAL_START;
-	lock_notify_all_object((java_object_t *) LLNI_DIRECT(this));
-	LLNI_CRITICAL_END;
+	lock_notify_all_object((java_handle_t *) this);
 #endif
 }
 
@@ -155,9 +151,7 @@ JNIEXPORT void JNICALL Java_java_lang_VMObject_wait(JNIEnv *env, jclass clazz, j
 #endif
 
 #if defined(ENABLE_THREADS)
-	LLNI_CRITICAL_START;
-	lock_wait_for_object((java_object_t *) LLNI_DIRECT(o), ms, ns);
-	LLNI_CRITICAL_END;
+	lock_wait_for_object((java_handle_t *) o, ms, ns);
 #endif
 
 #if defined(ENABLE_JVMTI)
diff --git a/src/native/vm/sun/jvm.c b/src/native/vm/sun/jvm.c
index a2594f5b1..80c0baa2c 100644
--- a/src/native/vm/sun/jvm.c
+++ b/src/native/vm/sun/jvm.c
@@ -530,9 +530,7 @@ void JVM_MonitorWait(JNIEnv* env, jobject handle, jlong ms)
 #if defined(ENABLE_THREADS)
 	o = (java_handle_t *) handle;
 
-	LLNI_CRITICAL_START;
-	lock_wait_for_object(LLNI_DIRECT(o), ms, 0);
-	LLNI_CRITICAL_END;
+	lock_wait_for_object(o, ms, 0);
 #endif
 }
 
@@ -550,9 +548,7 @@ void JVM_MonitorNotify(JNIEnv* env, jobject handle)
 #if defined(ENABLE_THREADS)
 	o = (java_handle_t *) handle;
 
-	LLNI_CRITICAL_START;
-	lock_notify_object(LLNI_DIRECT(o));
-	LLNI_CRITICAL_END;
+	lock_notify_object(o);
 #endif
 }
 
@@ -570,9 +566,7 @@ void JVM_MonitorNotifyAll(JNIEnv* env, jobject handle)
 #if defined(ENABLE_THREADS)
 	o = (java_handle_t *) handle;
 
-	LLNI_CRITICAL_START;
-	lock_notify_all_object(LLNI_DIRECT(o));
-	LLNI_CRITICAL_END;
+	lock_notify_all_object(o);
 #endif
 }