(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.
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
}
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
}
#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)
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
}
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
}
#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)
#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
}
#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
}
#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
}