Changes:
- $Id: finalizer.c 4552 2006-03-04 17:15:44Z twisti $
+ $Id: finalizer.c 5123 2006-07-12 21:45:34Z twisti $
*/
#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"
/* global variables ***********************************************************/
-#if defined(USE_THREADS)
+#if defined(ENABLE_THREADS)
static java_lang_VMThread *finalizer_vmthread;
static java_objectheader *lock_finalizer_thread;
#endif
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 */
*******************************************************************************/
-#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 */
*******************************************************************************/
-#if defined(USE_THREADS)
+#if defined(ENABLE_THREADS)
bool finalizer_start_thread(void)
{
java_lang_Thread *t;
t = (java_lang_Thread *) builtin_new(class_java_lang_Thread);
t->vmThread = finalizer_vmthread;
- t->name = javastring_new_char("Finalizer");
+ t->name = javastring_new_from_ascii("Finalizer");
t->daemon = true;
t->priority = 5;
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 */
void finalizer_run(void *o, void *p)
{
- java_objectheader *ob = (java_objectheader *) o;
+ java_objectheader *ob;
+
+ ob = (java_objectheader *) o;
/* call the finalizer function */
- vm_call_method_intern(ob->vftbl->class->finalizer, ob, NULL, NULL, NULL);
+ (void) vm_call_method(ob->vftbl->class->finalizer, ob);
/* if we had an exception in the finalizer, ignore it */