2000-12-30 13:18:39 +01:00
|
|
|
// nogc.cc - Implement null garbage collector.
|
1999-04-07 16:42:40 +02:00
|
|
|
|
ffi.h.in (ffi_closure_alloc, [...]): New.
libffi/ChangeLog:
* include/ffi.h.in (ffi_closure_alloc, ffi_closure_free): New.
(ffi_prep_closure_loc): New.
(ffi_prep_raw_closure_loc): New.
(ffi_prep_java_raw_closure_loc): New.
* src/closures.c: New file.
* src/dlmalloc.c [FFI_MMAP_EXEC_WRIT] (struct malloc_segment):
Replace sflags with exec_offset.
[FFI_MMAP_EXEC_WRIT] (mmap_exec_offset, add_segment_exec_offset,
sub_segment_exec_offset): New macros.
(get_segment_flags, set_segment_flags, check_segment_merge): New
macros.
(is_mmapped_segment, is_extern_segment): Use get_segment_flags.
(add_segment, sys_alloc, create_mspace, create_mspace_with_base,
destroy_mspace): Use new macros.
(sys_alloc): Silence warning.
* Makefile.am (libffi_la_SOURCES): Add src/closures.c.
* Makefile.in: Rebuilt.
* src/prep_cif [FFI_CLOSURES] (ffi_prep_closure): Implement in
terms of ffi_prep_closure_loc.
* src/raw_api.c (ffi_prep_raw_closure_loc): Renamed and adjusted
from...
(ffi_prep_raw_closure): ... this. Re-implement in terms of the
renamed version.
* src/java_raw_api (ffi_prep_java_raw_closure_loc): Renamed and
adjusted from...
(ffi_prep_java_raw_closure): ... this. Re-implement in terms of
the renamed version.
* src/alpha/ffi.c (ffi_prep_closure_loc): Renamed from
(ffi_prep_closure): ... this.
* src/pa/ffi.c: Likewise.
* src/cris/ffi.c: Likewise. Adjust.
* src/frv/ffi.c: Likewise.
* src/ia64/ffi.c: Likewise.
* src/mips/ffi.c: Likewise.
* src/powerpc/ffi_darwin.c: Likewise.
* src/s390/ffi.c: Likewise.
* src/sh/ffi.c: Likewise.
* src/sh64/ffi.c: Likewise.
* src/sparc/ffi.c: Likewise.
* src/x86/ffi64.c: Likewise.
* src/x86/ffi.c: Likewise.
(FFI_INIT_TRAMPOLINE): Adjust.
(ffi_prep_raw_closure_loc): Renamed and adjusted from...
(ffi_prep_raw_closure): ... this.
* src/powerpc/ffi.c (ffi_prep_closure_loc): Renamed from
(ffi_prep_closure): ... this.
(flush_icache): Adjust.
boehm-gc/ChangeLog:
* include/gc.h (GC_REGISTER_FINALIZER_UNREACHABLE): New.
(GC_register_finalizer_unreachable): Declare.
(GC_debug_register_finalizer_unreachable): Declare.
* finalize.c (GC_unreachable_finalize_mark_proc): New.
(GC_register_finalizer_unreachable): New.
(GC_finalize): Handle it.
* dbg_mlc.c (GC_debug_register_finalizer_unreachable): New.
(GC_debug_register_finalizer_no_order): Fix whitespace.
libjava/ChangeLog:
* include/jvm.h (_Jv_ClosureListFinalizer): New.
(_Jv_Linker::create_error_method): Adjust.
* boehm.cc (_Jv_ClosureListFinalizer): New.
* nogc.cc (_Jv_ClosureListFinalizer): New.
* java/lang/Class.h (class _Jv_ClosureList): New.
(class java::lang::Class): Declare it as friend.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures): New.
(_Jv_ClosureList::registerClousure): New.
* include/execution.h (_Jv_ExecutionEngine): Add get_closure_list.
(_Jv_CompiledEngine::do_get_closure_list): New.
(_Jv_CompiledEngine::_Jv_CompiledEngine): Use it.
(_Jv_IndirectCompiledClass): Add closures.
(_Jv_IndirectCompiledEngine::get_aux_info): New.
(_Jv_IndirectCompiledEngine::do_allocate_field_initializers): Use
it.
(_Jv_IndirectCompiledEngine::do_get_closure_list): New.
(_Jv_IndirectCompiledEngine::_Jv_IndirectCompiledEngine): Use it.
(_Jv_InterpreterEngine::do_get_closure_list): Declare.
(_Jv_InterpreterEngine::_Jv_InterpreterEngine): Use it.
* interpret.cc (FFI_PREP_RAW_CLOSURE): Use _loc variants.
(node_closure): Add closure list.
(_Jv_InterpMethod::ncode): Add jclass argument. Use
ffi_closure_alloc and the separate code pointer. Register the
closure for finalization.
(_Jv_JNIMethod::ncode): Likewise.
(_Jv_InterpreterEngine::do_create_ncode): Pass klass to ncode.
(_Jv_InterpreterEngine::do_get_closure_list): New.
* include/java-interp.h (_Jv_InterpMethod::ncode): Adjust.
(_Jv_InterpClass): Add closures field.
(_Jv_JNIMethod::ncode): Adjust.
* defineclass.cc (_Jv_ClassReader::handleCodeAttribute): Adjust.
(_Jv_ClassReader::handleMethodsEnd): Likewise.
* link.cc (struct method_closure): Add closure list.
(_Jv_Linker::create_error_method): Add jclass argument. Use
ffi_closure_alloc and the separate code pointer. Register the
closure for finalization.
(_Jv_Linker::link_symbol_table): Remove outdated comment about
sharing of otable and atable. Adjust.
* java/lang/reflect/natVMProxy.cc (ncode_closure): Add closure
list.
(ncode): Add jclass argument. Use ffi_closure_alloc and the
separate code pointer. Register the closure for finalization.
(java::lang::reflect::VMProxy::generateProxyClass): Adjust.
* testsuite/libjava.jar/TestClosureGC.java: New.
* testsuite/libjava.jar/TestClosureGC.out: New.
* testsuite/libjava.jar/TestClosureGC.xfail: New.
* testsuite/libjava.jar/TestClosureGC.jar: New.
From-SVN: r122652
2007-03-07 08:27:25 +01:00
|
|
|
/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006, 2007
|
|
|
|
Free Software Foundation
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
This file is part of libgcj.
|
|
|
|
|
|
|
|
This software is copyrighted work licensed under the terms of the
|
|
|
|
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
|
|
|
details. */
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
1999-09-11 00:03:10 +02:00
|
|
|
#include <gcj/cni.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
#include <jvm.h>
|
|
|
|
|
|
|
|
// Total amount of memory allocated.
|
|
|
|
static long total = 0;
|
|
|
|
|
|
|
|
void *
|
2002-01-27 23:33:35 +01:00
|
|
|
_Jv_BuildGCDescr(jclass)
|
2000-09-30 11:56:58 +02:00
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void *
|
|
|
|
_Jv_AllocObj (jsize size, jclass klass)
|
1999-04-07 16:42:40 +02:00
|
|
|
{
|
|
|
|
total += size;
|
2000-12-30 13:18:39 +01:00
|
|
|
void *obj = calloc (size, 1);
|
2001-05-24 07:40:37 +02:00
|
|
|
if (!obj) _Jv_ThrowNoMemory();
|
|
|
|
*((_Jv_VTable **) obj) = klass->vtable;
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
void *
|
|
|
|
_Jv_AllocPtrFreeObj (jsize size, jclass klass)
|
|
|
|
{
|
|
|
|
total += size;
|
2002-01-27 23:33:35 +01:00
|
|
|
void *obj = calloc (size, 1);
|
2001-05-24 07:40:37 +02:00
|
|
|
if (!obj) _Jv_ThrowNoMemory();
|
2000-09-30 11:56:58 +02:00
|
|
|
*((_Jv_VTable **) obj) = klass->vtable;
|
|
|
|
return obj;
|
1999-04-07 16:42:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void *
|
2000-09-30 11:56:58 +02:00
|
|
|
_Jv_AllocArray (jsize size, jclass klass)
|
1999-04-07 16:42:40 +02:00
|
|
|
{
|
|
|
|
total += size;
|
2000-12-30 13:18:39 +01:00
|
|
|
void *obj = calloc (size, 1);
|
2001-05-24 07:40:37 +02:00
|
|
|
if (!obj) _Jv_ThrowNoMemory();
|
2000-09-30 11:56:58 +02:00
|
|
|
*((_Jv_VTable **) obj) = klass->vtable;
|
|
|
|
return obj;
|
1999-04-07 16:42:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void *
|
|
|
|
_Jv_AllocBytes (jsize size)
|
|
|
|
{
|
|
|
|
total += size;
|
2002-01-27 23:33:35 +01:00
|
|
|
void *obj = calloc (size, 1);
|
2001-05-24 07:40:37 +02:00
|
|
|
if (!obj) _Jv_ThrowNoMemory();
|
|
|
|
return obj;
|
1999-04-07 16:42:40 +02:00
|
|
|
}
|
|
|
|
|
2001-09-10 03:21:08 +02:00
|
|
|
void *
|
|
|
|
_Jv_AllocRawObj (jsize size)
|
|
|
|
{
|
|
|
|
total += size;
|
|
|
|
return calloc (size, 1);
|
|
|
|
}
|
|
|
|
|
ffi.h.in (ffi_closure_alloc, [...]): New.
libffi/ChangeLog:
* include/ffi.h.in (ffi_closure_alloc, ffi_closure_free): New.
(ffi_prep_closure_loc): New.
(ffi_prep_raw_closure_loc): New.
(ffi_prep_java_raw_closure_loc): New.
* src/closures.c: New file.
* src/dlmalloc.c [FFI_MMAP_EXEC_WRIT] (struct malloc_segment):
Replace sflags with exec_offset.
[FFI_MMAP_EXEC_WRIT] (mmap_exec_offset, add_segment_exec_offset,
sub_segment_exec_offset): New macros.
(get_segment_flags, set_segment_flags, check_segment_merge): New
macros.
(is_mmapped_segment, is_extern_segment): Use get_segment_flags.
(add_segment, sys_alloc, create_mspace, create_mspace_with_base,
destroy_mspace): Use new macros.
(sys_alloc): Silence warning.
* Makefile.am (libffi_la_SOURCES): Add src/closures.c.
* Makefile.in: Rebuilt.
* src/prep_cif [FFI_CLOSURES] (ffi_prep_closure): Implement in
terms of ffi_prep_closure_loc.
* src/raw_api.c (ffi_prep_raw_closure_loc): Renamed and adjusted
from...
(ffi_prep_raw_closure): ... this. Re-implement in terms of the
renamed version.
* src/java_raw_api (ffi_prep_java_raw_closure_loc): Renamed and
adjusted from...
(ffi_prep_java_raw_closure): ... this. Re-implement in terms of
the renamed version.
* src/alpha/ffi.c (ffi_prep_closure_loc): Renamed from
(ffi_prep_closure): ... this.
* src/pa/ffi.c: Likewise.
* src/cris/ffi.c: Likewise. Adjust.
* src/frv/ffi.c: Likewise.
* src/ia64/ffi.c: Likewise.
* src/mips/ffi.c: Likewise.
* src/powerpc/ffi_darwin.c: Likewise.
* src/s390/ffi.c: Likewise.
* src/sh/ffi.c: Likewise.
* src/sh64/ffi.c: Likewise.
* src/sparc/ffi.c: Likewise.
* src/x86/ffi64.c: Likewise.
* src/x86/ffi.c: Likewise.
(FFI_INIT_TRAMPOLINE): Adjust.
(ffi_prep_raw_closure_loc): Renamed and adjusted from...
(ffi_prep_raw_closure): ... this.
* src/powerpc/ffi.c (ffi_prep_closure_loc): Renamed from
(ffi_prep_closure): ... this.
(flush_icache): Adjust.
boehm-gc/ChangeLog:
* include/gc.h (GC_REGISTER_FINALIZER_UNREACHABLE): New.
(GC_register_finalizer_unreachable): Declare.
(GC_debug_register_finalizer_unreachable): Declare.
* finalize.c (GC_unreachable_finalize_mark_proc): New.
(GC_register_finalizer_unreachable): New.
(GC_finalize): Handle it.
* dbg_mlc.c (GC_debug_register_finalizer_unreachable): New.
(GC_debug_register_finalizer_no_order): Fix whitespace.
libjava/ChangeLog:
* include/jvm.h (_Jv_ClosureListFinalizer): New.
(_Jv_Linker::create_error_method): Adjust.
* boehm.cc (_Jv_ClosureListFinalizer): New.
* nogc.cc (_Jv_ClosureListFinalizer): New.
* java/lang/Class.h (class _Jv_ClosureList): New.
(class java::lang::Class): Declare it as friend.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures): New.
(_Jv_ClosureList::registerClousure): New.
* include/execution.h (_Jv_ExecutionEngine): Add get_closure_list.
(_Jv_CompiledEngine::do_get_closure_list): New.
(_Jv_CompiledEngine::_Jv_CompiledEngine): Use it.
(_Jv_IndirectCompiledClass): Add closures.
(_Jv_IndirectCompiledEngine::get_aux_info): New.
(_Jv_IndirectCompiledEngine::do_allocate_field_initializers): Use
it.
(_Jv_IndirectCompiledEngine::do_get_closure_list): New.
(_Jv_IndirectCompiledEngine::_Jv_IndirectCompiledEngine): Use it.
(_Jv_InterpreterEngine::do_get_closure_list): Declare.
(_Jv_InterpreterEngine::_Jv_InterpreterEngine): Use it.
* interpret.cc (FFI_PREP_RAW_CLOSURE): Use _loc variants.
(node_closure): Add closure list.
(_Jv_InterpMethod::ncode): Add jclass argument. Use
ffi_closure_alloc and the separate code pointer. Register the
closure for finalization.
(_Jv_JNIMethod::ncode): Likewise.
(_Jv_InterpreterEngine::do_create_ncode): Pass klass to ncode.
(_Jv_InterpreterEngine::do_get_closure_list): New.
* include/java-interp.h (_Jv_InterpMethod::ncode): Adjust.
(_Jv_InterpClass): Add closures field.
(_Jv_JNIMethod::ncode): Adjust.
* defineclass.cc (_Jv_ClassReader::handleCodeAttribute): Adjust.
(_Jv_ClassReader::handleMethodsEnd): Likewise.
* link.cc (struct method_closure): Add closure list.
(_Jv_Linker::create_error_method): Add jclass argument. Use
ffi_closure_alloc and the separate code pointer. Register the
closure for finalization.
(_Jv_Linker::link_symbol_table): Remove outdated comment about
sharing of otable and atable. Adjust.
* java/lang/reflect/natVMProxy.cc (ncode_closure): Add closure
list.
(ncode): Add jclass argument. Use ffi_closure_alloc and the
separate code pointer. Register the closure for finalization.
(java::lang::reflect::VMProxy::generateProxyClass): Adjust.
* testsuite/libjava.jar/TestClosureGC.java: New.
* testsuite/libjava.jar/TestClosureGC.out: New.
* testsuite/libjava.jar/TestClosureGC.xfail: New.
* testsuite/libjava.jar/TestClosureGC.jar: New.
From-SVN: r122652
2007-03-07 08:27:25 +01:00
|
|
|
_Jv_ClosureList **
|
|
|
|
_Jv_ClosureListFinalizer ()
|
|
|
|
{
|
|
|
|
_Jv_ClosureList **clpp;
|
|
|
|
clpp = (_Jv_ClosureList **)_Jv_AllocBytes (sizeof (*clpp));
|
|
|
|
return clpp;
|
|
|
|
}
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
void
|
|
|
|
_Jv_RegisterFinalizer (void *, _Jv_FinalizerFunc *)
|
|
|
|
{
|
|
|
|
// FIXME: should actually register so that finalizers can be run on
|
|
|
|
// exit.
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_Jv_RunFinalizers (void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_Jv_RunAllFinalizers (void)
|
|
|
|
{
|
|
|
|
// FIXME: should still run all finalizers.
|
|
|
|
}
|
|
|
|
|
2001-10-11 00:25:43 +02:00
|
|
|
void
|
|
|
|
_Jv_GCInitializeFinalizers (void (*) (void))
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
void
|
|
|
|
_Jv_RunGC (void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
long
|
|
|
|
_Jv_GCTotalMemory (void)
|
|
|
|
{
|
|
|
|
return total;
|
|
|
|
}
|
|
|
|
|
|
|
|
long
|
|
|
|
_Jv_GCFreeMemory (void)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
1999-10-22 21:43:41 +02:00
|
|
|
void
|
2002-01-27 23:33:35 +01:00
|
|
|
_Jv_GCSetInitialHeapSize (size_t)
|
1999-10-22 21:43:41 +02:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2002-01-27 23:33:35 +01:00
|
|
|
_Jv_GCSetMaximumHeapSize (size_t)
|
1999-10-22 21:43:41 +02:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2000-04-02 17:34:17 +02:00
|
|
|
void
|
|
|
|
_Jv_DisableGC (void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_Jv_EnableGC (void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
void
|
|
|
|
_Jv_InitGC (void)
|
|
|
|
{
|
|
|
|
}
|
2001-05-24 07:40:37 +02:00
|
|
|
|
2002-01-27 23:33:35 +01:00
|
|
|
void
|
|
|
|
_Jv_GCRegisterDisappearingLink (jobject *)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
jboolean
|
|
|
|
_Jv_GCCanReclaimSoftReference (jobject)
|
|
|
|
{
|
|
|
|
// For now, always reclaim soft references. FIXME.
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2001-05-24 07:40:37 +02:00
|
|
|
#ifdef JV_HASH_SYNCHRONIZATION
|
|
|
|
void *
|
|
|
|
_Jv_AllocTraceOne (jsize size /* includes vtable slot */)
|
|
|
|
{
|
2002-01-27 23:33:35 +01:00
|
|
|
void *obj = calloc(size, 1);
|
2001-05-24 07:40:37 +02:00
|
|
|
if (!obj) _Jv_ThrowNoMemory();
|
|
|
|
return result;
|
|
|
|
}
|
2001-10-16 00:42:42 +02:00
|
|
|
|
|
|
|
void *
|
|
|
|
_Jv_AllocTraceTwo (jsize size /* includes vtable slot */)
|
|
|
|
{
|
2002-01-27 23:33:35 +01:00
|
|
|
void *obj = calloc(size, 1);
|
2001-10-16 00:42:42 +02:00
|
|
|
if (!obj) _Jv_ThrowNoMemory();
|
|
|
|
return result;
|
|
|
|
}
|
2001-05-24 07:40:37 +02:00
|
|
|
#endif /* JV_HASH_SYNCHRONIZATION */
|
2006-06-26 18:31:06 +02:00
|
|
|
|
|
|
|
void
|
|
|
|
_Jv_SuspendThread (_Jv_Thread_t *thread)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_Jv_ResumeThread (_Jv_Thread_t *thread)
|
|
|
|
{
|
|
|
|
}
|