* src/vm/jit/powerpc/emit.c (emit_replacement_stubs): Do not

[cacao.git] / src / vm / finalizer.c

diff --git a/src/vm/finalizer.c b/src/vm/finalizer.c
index b0ac3c91dbb6050b8aa9e3c92cc5bceda1cbccfe..e0e69d02c0297e5ef6d67f51dc15a2c63ae81f83 100644 (file)
--- a/src/vm/finalizer.c
+++ b/src/vm/finalizer.c
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: finalizer.c 4874 2006-05-05 14:36:18Z edwin $
+   $Id: finalizer.c 5123 2006-07-12 21:45:34Z twisti $
 
 */
 
@@ -43,6 +43,11 @@
 #include "native/jni.h"
 #include "native/include/java_lang_Thread.h"
 #include "native/include/java_lang_VMThread.h"
+
+#if defined(ENABLE_THREADS)
+# include "threads/native/lock.h"
+#endif
+
 #include "vm/builtin.h"
 #include "vm/exceptions.h"
 #include "vm/global.h"
@@ -54,7 +59,7 @@
 
 /* global variables ***********************************************************/
 
-#if defined(USE_THREADS)
+#if defined(ENABLE_THREADS)
 static java_lang_VMThread *finalizer_vmthread;
 static java_objectheader *lock_finalizer_thread;
 #endif
@@ -68,12 +73,10 @@ static java_objectheader *lock_finalizer_thread;
 
 bool finalizer_init(void)
 {
-#if defined(USE_THREADS)
+#if defined(ENABLE_THREADS)
        lock_finalizer_thread = NEW(java_objectheader);
 
-# if defined(NATIVE_THREADS)
-       initObjectLock(lock_finalizer_thread);
-# endif
+       lock_init_object_lock(lock_finalizer_thread);
 #endif
 
        /* everything's ok */
@@ -90,21 +93,21 @@ bool finalizer_init(void)
 
 *******************************************************************************/
 
-#if defined(USE_THREADS)
+#if defined(ENABLE_THREADS)
 static void finalizer_thread(void)
 {
        while (true) {
                /* get the lock on the finalizer lock object, so we can call wait */
 
-               builtin_monitorenter(lock_finalizer_thread);
+               lock_monitor_enter(lock_finalizer_thread);
 
                /* wait forever (0, 0) on that object till we are signaled */
        
-               wait_cond_for_object(lock_finalizer_thread, 0, 0);
+               lock_wait_for_object(lock_finalizer_thread, 0, 0);
 
                /* leave the lock */
 
-               builtin_monitorexit(lock_finalizer_thread);
+               lock_monitor_exit(lock_finalizer_thread);
 
                /* and call the finalizers */
 
@@ -120,7 +123,7 @@ static void finalizer_thread(void)
 
 *******************************************************************************/
 
-#if defined(USE_THREADS)
+#if defined(ENABLE_THREADS)
 bool finalizer_start_thread(void)
 {
        java_lang_Thread *t;
@@ -162,18 +165,18 @@ bool finalizer_start_thread(void)
 
 void finalizer_notify(void)
 {
-#if defined(USE_THREADS)
+#if defined(ENABLE_THREADS)
        /* get the lock on the finalizer lock object, so we can call wait */
 
-       builtin_monitorenter(lock_finalizer_thread);
+       lock_monitor_enter(lock_finalizer_thread);
 
        /* signal the finalizer thread */
        
-       signal_cond_for_object(lock_finalizer_thread);
+       lock_notify_object(lock_finalizer_thread);
 
        /* leave the lock */
 
-       builtin_monitorexit(lock_finalizer_thread);
+       lock_monitor_exit(lock_finalizer_thread);
 #else
        /* if we don't have threads, just run the finalizers */