1999-04-07 16:42:40 +02:00
|
|
|
|
// boehm.cc - interface between libjava and Boehm GC.
|
|
|
|
|
|
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, 2003, 2004, 2005, 2006, 2007
|
2004-11-25 04:47:08 +01:00
|
|
|
|
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>
|
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <limits.h>
|
|
|
|
|
|
|
|
|
|
#include <jvm.h>
|
|
|
|
|
#include <gcj/cni.h>
|
|
|
|
|
|
|
|
|
|
#include <java/lang/Class.h>
|
|
|
|
|
#include <java/lang/reflect/Modifier.h>
|
|
|
|
|
#include <java-interp.h>
|
|
|
|
|
|
|
|
|
|
// More nastiness: the GC wants to define TRUE and FALSE. We don't
|
|
|
|
|
// need the Java definitions (themselves a hack), so we undefine them.
|
|
|
|
|
#undef TRUE
|
|
|
|
|
#undef FALSE
|
|
|
|
|
|
2006-02-09 02:35:33 +01:00
|
|
|
|
// We include two autoconf headers. Avoid multiple definition warnings.
|
|
|
|
|
#undef PACKAGE_NAME
|
|
|
|
|
#undef PACKAGE_STRING
|
|
|
|
|
#undef PACKAGE_TARNAME
|
|
|
|
|
#undef PACKAGE_VERSION
|
|
|
|
|
|
2006-04-24 17:33:16 +02:00
|
|
|
|
#ifdef HAVE_DLFCN_H
|
|
|
|
|
#undef _GNU_SOURCE
|
|
|
|
|
#define _GNU_SOURCE
|
|
|
|
|
#include <dlfcn.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
extern "C"
|
|
|
|
|
{
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
#include <gc_config.h>
|
|
|
|
|
|
|
|
|
|
// Set GC_DEBUG before including gc.h!
|
|
|
|
|
#ifdef LIBGCJ_GC_DEBUG
|
|
|
|
|
# define GC_DEBUG
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include <gc_mark.h>
|
2001-05-21 10:37:04 +02:00
|
|
|
|
#include <gc_gcj.h>
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
#include <javaxfc.h> // GC_finalize_all declaration.
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
2001-08-18 03:01:51 +02:00
|
|
|
|
#ifdef THREAD_LOCAL_ALLOC
|
|
|
|
|
# define GC_REDIRECT_TO_LOCAL
|
|
|
|
|
# include <gc_local_alloc.h>
|
|
|
|
|
#endif
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
// From boehm's misc.c
|
|
|
|
|
void GC_enable();
|
|
|
|
|
void GC_disable();
|
|
|
|
|
};
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
#define MAYBE_MARK(Obj, Top, Limit, Source) \
|
|
|
|
|
Top=GC_MARK_AND_PUSH((GC_PTR) Obj, Top, Limit, (GC_PTR *) Source)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
2000-09-30 11:56:58 +02:00
|
|
|
|
// `kind' index used when allocating Java arrays.
|
|
|
|
|
static int array_kind_x;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
|
// Freelist used for Java arrays.
|
2004-11-25 04:47:08 +01:00
|
|
|
|
static void **array_free_list;
|
2000-04-02 17:34:17 +02:00
|
|
|
|
|
2006-04-24 17:33:16 +02:00
|
|
|
|
static int _Jv_GC_has_static_roots (const char *filename, void *, size_t);
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// This is called by the GC during the mark phase. It marks a Java
|
|
|
|
|
// object. We use `void *' arguments and return, and not what the
|
|
|
|
|
// Boehm GC wants, to avoid pollution in our headers.
|
|
|
|
|
void *
|
2004-11-25 04:47:08 +01:00
|
|
|
|
_Jv_MarkObj (void *addr, void *msp, void *msl, void *env)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
struct GC_ms_entry *mark_stack_ptr = (struct GC_ms_entry *)msp;
|
|
|
|
|
struct GC_ms_entry *mark_stack_limit = (struct GC_ms_entry *)msl;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
if (env == (void *)1) /* Object allocated with debug allocator. */
|
|
|
|
|
addr = (GC_PTR)GC_USR_PTR_FROM_BASE(addr);
|
|
|
|
|
jobject obj = (jobject) addr;
|
2000-09-30 11:56:58 +02:00
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
_Jv_VTable *dt = *(_Jv_VTable **) addr;
|
2000-09-30 11:56:58 +02:00
|
|
|
|
// The object might not yet have its vtable set, or it might
|
|
|
|
|
// really be an object on the freelist. In either case, the vtable slot
|
|
|
|
|
// will either be 0, or it will point to a cleared object.
|
|
|
|
|
// This assumes Java objects have size at least 3 words,
|
|
|
|
|
// including the header. But this should remain true, since this
|
|
|
|
|
// should only be used with debugging allocation or with large objects.
|
|
|
|
|
if (__builtin_expect (! dt || !(dt -> get_finalizer()), false))
|
1999-04-07 16:42:40 +02:00
|
|
|
|
return mark_stack_ptr;
|
|
|
|
|
jclass klass = dt->clas;
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
GC_PTR p;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
2006-02-08 21:07:29 +01:00
|
|
|
|
p = (GC_PTR) dt;
|
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, obj);
|
|
|
|
|
|
2001-05-24 07:40:37 +02:00
|
|
|
|
# ifndef JV_HASH_SYNCHRONIZATION
|
|
|
|
|
// Every object has a sync_info pointer.
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
p = (GC_PTR) obj->sync_info;
|
2004-11-25 04:47:08 +01:00
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, obj);
|
2001-05-24 07:40:37 +02:00
|
|
|
|
# endif
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
natField.cc (BooleanClass): Don't define.
* java/lang/reflect/natField.cc (BooleanClass): Don't define.
* java/lang/reflect/natArray.cc (BooleanClass): Don't define.
* java/lang/Class.h (Object): Added `class$' field.
* java/lang/Object.h (Object): Added `class$' field.
* defineclass.cc (ClassClass): Use `class$' form.
(ClassObject): Likewise.
* resolve.cc (ClassObject): Use `class$' form.
(ObjectClass): Likewise.
* interpret.cc (ClassError): Removed.
* java/net/natPlainDatagramSocketImpl.cc (BooleanClass): Use
`class$' form.
(IntegerClass): Likewise.
* java/net/natPlainSocketImpl.cc (BooleanClass): Use `class$'
form.
* java/lang/natClassLoader.cc (CloneableClass): Use `class$' form.
(ObjectClass, ClassClass, VMClassLoaderClass, ClassLoaderClass,
SerializableClass): Likewise.
Include Serializable.h, Cloneable.h.
* java/lang/natSystem.cc (SystemClass): Removed.
(init_properties): Use `class$' form.
* java/lang/natObject.cc (CloneableClass): Removed.
(clone): Use `class$' form.
* java/lang/natClass.cc (CloneableClass): Use `class$' form.
(ObjectClass, ErrorClass, ClassClass, MethodClass, FieldClass,
ConstructorClass): Likewise.
* java/lang/reflect/natMethod.cc (ObjectClass): Use `class$' form.
(ClassClass, VoidClass, ByteClass, ShortClass, CharacterClass,
IntegerClass, LongClass, FloatClass, DoubleClass): Likewise.
* java/io/natObjectInputStream.cc (ObjectClass): Use `class$'
form.
(ClassClass): Likewise.
* include/jvm.h (StringClass): Use `class$' form.
* prims.cc (ObjectClass): Removed.
(_Jv_RunMain): Use `class$' form.
(_Jv_AllocObject): Likewise.
* jni.cc (ClassClass): Use `class$' form.
(ThrowableClass): Likewise.
(ObjectClass): Likewise.
(MethodClass): Likewise.
(ThreadGroupClass): Likewise.
(NativeThreadClass): Likewise.
* boehm.cc (ObjectClass): Removed.
(ClassClass): Removed.
(_Jv_MarkObj): Use `class$' form.
* gcj/field.h (JvFieldIsRef): Use `class$' form.
Include RawData.h.
From-SVN: r36740
2000-10-06 03:49:32 +02:00
|
|
|
|
if (__builtin_expect (klass == &java::lang::Class::class$, false))
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
2000-09-30 11:56:58 +02:00
|
|
|
|
// Currently we allocate some of the memory referenced from class objects
|
|
|
|
|
// as pointerfree memory, and then mark it more intelligently here.
|
|
|
|
|
// We ensure that the ClassClass mark descriptor forces invocation of
|
|
|
|
|
// this procedure.
|
|
|
|
|
// Correctness of this is subtle, but it looks OK to me for now. For the incremental
|
|
|
|
|
// collector, we need to make sure that the class object is written whenever
|
|
|
|
|
// any of the subobjects are altered and may need rescanning. This may be tricky
|
|
|
|
|
// during construction, and this may not be the right way to do this with
|
|
|
|
|
// incremental collection.
|
|
|
|
|
// If we overflow the mark stack, we will rescan the class object, so we should
|
|
|
|
|
// be OK. The same applies if we redo the mark phase because win32 unmapped part
|
|
|
|
|
// of our root set. - HB
|
1999-04-07 16:42:40 +02:00
|
|
|
|
jclass c = (jclass) addr;
|
|
|
|
|
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
p = (GC_PTR) c->name;
|
2004-11-25 04:47:08 +01:00
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c);
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
p = (GC_PTR) c->superclass;
|
2004-11-25 04:47:08 +01:00
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c);
|
[multiple changes]
1999-08-09 Anthony Green <green@cygnus.com>
* gij.cc: New file.
* include/config.h.in: Rebuilt.
* acconfig.h: Add INTERPRETER.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am (libffi_files): Identify the libffi object files for
inclusion in libgcj.
(LIBFFIINCS): Define.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Dummy definition for configurations without an interpreter.
* java/net/natPlainSocketImpl.cc (getOption): Disamiguate call to
java::lang::Boolean constructor.
* include/java-interp.h: Always include java-cpool.h.
* java/lang/natClassLoader.cc (getVMClassLoader0): Always return 0
when INTERPRETER not defined.
* java/lang/Class.h (finalize): Define.
* gnu/gcj/util/path/DirectoryPathEntry.java (getURL): Catch
IOException from File.getCanonicalPath.
(getStream): Likewise.
* NEWS: More news.
* THANKS: More thanks.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* resolve.cc (get_ffi_type_from_signature): Generate uint16 for
jchar type.
(_Jv_PrepareClass): Allow non-abstract classes to
have abstract subclasses.
(_Jv_ResolvePoolEntry): Revert subclass check for protected
fields and methods.
* interpret.cc (continue1/perform_invoke): Don't sign extend
uint16 return val.
(continue1/lshl,lshr): Push long, not int.
(continue1/ulshr): Use UINT64, not long long.
* defineclass.cc (handleFieldsEnd): Handle case when all fields
are static.
* java/lang/natClass.cc (forName): Add call to _Jv_InitClass.
* java/lang/FirstThread.java (run): Add top-level exception
handler.
(run0): Renamed from run.
1999-08-08 Kresten Krab Thorup <krab@gnu.org>
* configure.in (--with-interpreter): Added.
* include/config.h.in (INTERPRETER): Added.
* java/lang/ClassLoader.java: File replaced.
* java/lang/VMClassLoader.java: New file.
* java/lang/natClassLoader.cc: New file.
* gnu/gcj/runtime/MethodInvocation.java: New file.
* gnu/gcj/util/path/SearchPath.java: New file.
* gnu/gcj/util/path/PathEntry.java: New file.
* gnu/gcj/util/path/DirectoryPathEntry.java: New file.
* gnu/gcj/util/path/ZipPathEntry.java: New file.
* gnu/gcj/util/path/URLPathEntry.java: New file.
* gnu/gcj/util/path/CacheEntry.java: New file.
* include/java-interp.h: New file.
* include/java-cpool.h: New file.
* include/java-insns.h: New file.
* defineclass.cc: New file.
* interpret.cc: New file.
* resolve.cc: New file.
* java/lang/natClass.cc (loaded_classes, _Jv_RegisterClass,
_Jv_RegisterClasses, _Jv_FindClassInCache, _Jv_FindClass,
_Jv_NewClass, _Jv_FindArrayClass): Moved to natClassLoader.cc.
(finalize): New.
(STATE_NOTHING, STATE_RESOLVED, STATE_IN_PROGRESS, STATE_DONE,
STATE_ERROR): Moved to java/lang/Class.h and renamed with JV_
prefix.
(initializeClass): Use new JV_ prefixed names. Also, call
ClassLoader::resolveClass instead of _Jv_ResolveClass.
* java/lang/Class.h (JV_STATE_PRELOADING, JV_STATE_LOADING,
JV_STATE_LOADED, JV_STATE_COMPILED, JV_STATE_PREPARED,
JV_STATE_LINKED): New.
(_Jv_WaitForState, _Jv_RegisterInitiatingLoader,
_Jv_UnregisterClass, _Jv_InternClassStrings): New friends.
(_Jv_IsInterpretedClass, _Jv_InitField, _Jv_LookupDeclaredMethod,
_Jv_DetermineVTableIndex, _Jv_ResolvePoolEntry, _Jv_PrepareClass,
_Jv_ClassReader, _Jv_InterpClass, _Jv_InterpMethod,
_Jv_InterpMethodInvocation): New friends for interpreter.
(finalize): New.
(CONSTANT_Class, CONSTANT_String, etc.): Moved to
include/java-cpool.h and renamed with JV_ prefix.
* include/jvm.h (_Jv_makeUtf8Const, _Jv_makeUtf8TypeConst): New
decls.
(_Jv_UnregisterClass): New decl.
* java/lang/natClassLoader.cc (_Jv_FindArrayClass): Added
class loader argument.
(_Jv_FindClass): Use class loader.
* prims.cc (_Jv_makeUtf8Const): New function.
(_Jv_NewObjectArray): Change use of _Jv_FindArrayClass.
(_Jv_NewPrimArray): Ditto.
(_Jv_FindClassFromSignature): Ditto.
* java/lang/reflect/natArray.cc (newInstance): Ditto.
* java/lang/reflect/natMethod.cc (getType): Ditto.
* include/java-field.h (_Jv_Field::isRef): Make robust for
non-resolved contexts.
* boehm.cc (_Jv_MarkObj): Mark interpreter-related fields.
Also, don't mark class->next field.
* java/lang/VirtualMachineError.java: Added FIXME note.
* configure.in (INTERPSPEC): New spec.
* libgcj.spec.in: Added INTERPSPEC.
* Makefile.am: Added gcjh friends for java/lang/VMClassLoader and
gnu/gcj/runtime/MethodInvocation.
(libgcj_la_SOURCES): Added resolve.cc defineclass.cc interpret.cc.
(ordinary_java_source_files): Added above mentioned java classes.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
From-SVN: r28597
1999-08-08 16:06:23 +02:00
|
|
|
|
|
2006-02-08 21:07:29 +01:00
|
|
|
|
p = (GC_PTR) c->constants.tags;
|
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c);
|
|
|
|
|
p = (GC_PTR) c->constants.data;
|
2004-11-25 04:47:08 +01:00
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c);
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
// If the class is an array, then the methods field holds a
|
|
|
|
|
// pointer to the element class. If the class is primitive,
|
|
|
|
|
// then the methods field holds a pointer to the array class.
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
p = (GC_PTR) c->methods;
|
2004-11-25 04:47:08 +01:00
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
p = (GC_PTR) c->fields;
|
2004-11-25 04:47:08 +01:00
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
2006-02-08 21:07:29 +01:00
|
|
|
|
// The vtable might be allocated even for compiled code.
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
p = (GC_PTR) c->vtable;
|
2004-11-25 04:47:08 +01:00
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c);
|
2006-02-08 21:07:29 +01:00
|
|
|
|
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
p = (GC_PTR) c->interfaces;
|
2004-11-25 04:47:08 +01:00
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c);
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
p = (GC_PTR) c->loader;
|
2004-11-25 04:47:08 +01:00
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c);
|
|
|
|
|
|
|
|
|
|
// The dispatch tables can be allocated at runtime.
|
|
|
|
|
p = (GC_PTR) c->ancestors;
|
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c);
|
|
|
|
|
|
2006-02-08 21:07:29 +01:00
|
|
|
|
p = (GC_PTR) c->idt;
|
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c);
|
2004-11-25 04:47:08 +01:00
|
|
|
|
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
p = (GC_PTR) c->arrayclass;
|
2004-11-25 04:47:08 +01:00
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c);
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
p = (GC_PTR) c->protectionDomain;
|
2004-11-25 04:47:08 +01:00
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c);
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
p = (GC_PTR) c->hack_signers;
|
2004-11-25 04:47:08 +01:00
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c);
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
p = (GC_PTR) c->aux_info;
|
2004-11-25 04:47:08 +01:00
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c);
|
2006-07-06 20:25:28 +02:00
|
|
|
|
|
2007-01-09 20:58:05 +01:00
|
|
|
|
p = (GC_PTR) c->reflection_data;
|
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c);
|
|
|
|
|
|
2006-07-06 20:25:28 +02:00
|
|
|
|
// The class chain must be marked for runtime-allocated Classes
|
|
|
|
|
// loaded by the bootstrap ClassLoader.
|
|
|
|
|
p = (GC_PTR) c->next_or_version;
|
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
// NOTE: each class only holds information about the class
|
|
|
|
|
// itself. So we must do the marking for the entire inheritance
|
|
|
|
|
// tree in order to mark all fields. FIXME: what about
|
|
|
|
|
// interfaces? We skip Object here, because Object only has a
|
|
|
|
|
// sync_info, and we handled that earlier.
|
|
|
|
|
// Note: occasionally `klass' can be null. For instance, this
|
|
|
|
|
// can happen if a GC occurs between the point where an object
|
|
|
|
|
// is allocated and where the vtbl slot is set.
|
natField.cc (BooleanClass): Don't define.
* java/lang/reflect/natField.cc (BooleanClass): Don't define.
* java/lang/reflect/natArray.cc (BooleanClass): Don't define.
* java/lang/Class.h (Object): Added `class$' field.
* java/lang/Object.h (Object): Added `class$' field.
* defineclass.cc (ClassClass): Use `class$' form.
(ClassObject): Likewise.
* resolve.cc (ClassObject): Use `class$' form.
(ObjectClass): Likewise.
* interpret.cc (ClassError): Removed.
* java/net/natPlainDatagramSocketImpl.cc (BooleanClass): Use
`class$' form.
(IntegerClass): Likewise.
* java/net/natPlainSocketImpl.cc (BooleanClass): Use `class$'
form.
* java/lang/natClassLoader.cc (CloneableClass): Use `class$' form.
(ObjectClass, ClassClass, VMClassLoaderClass, ClassLoaderClass,
SerializableClass): Likewise.
Include Serializable.h, Cloneable.h.
* java/lang/natSystem.cc (SystemClass): Removed.
(init_properties): Use `class$' form.
* java/lang/natObject.cc (CloneableClass): Removed.
(clone): Use `class$' form.
* java/lang/natClass.cc (CloneableClass): Use `class$' form.
(ObjectClass, ErrorClass, ClassClass, MethodClass, FieldClass,
ConstructorClass): Likewise.
* java/lang/reflect/natMethod.cc (ObjectClass): Use `class$' form.
(ClassClass, VoidClass, ByteClass, ShortClass, CharacterClass,
IntegerClass, LongClass, FloatClass, DoubleClass): Likewise.
* java/io/natObjectInputStream.cc (ObjectClass): Use `class$'
form.
(ClassClass): Likewise.
* include/jvm.h (StringClass): Use `class$' form.
* prims.cc (ObjectClass): Removed.
(_Jv_RunMain): Use `class$' form.
(_Jv_AllocObject): Likewise.
* jni.cc (ClassClass): Use `class$' form.
(ThrowableClass): Likewise.
(ObjectClass): Likewise.
(MethodClass): Likewise.
(ThreadGroupClass): Likewise.
(NativeThreadClass): Likewise.
* boehm.cc (ObjectClass): Removed.
(ClassClass): Removed.
(_Jv_MarkObj): Use `class$' form.
* gcj/field.h (JvFieldIsRef): Use `class$' form.
Include RawData.h.
From-SVN: r36740
2000-10-06 03:49:32 +02:00
|
|
|
|
while (klass && klass != &java::lang::Object::class$)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
|
|
|
|
jfieldID field = JvGetFirstInstanceField (klass);
|
|
|
|
|
jint max = JvNumInstanceFields (klass);
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < max; ++i)
|
|
|
|
|
{
|
|
|
|
|
if (JvFieldIsRef (field))
|
|
|
|
|
{
|
|
|
|
|
jobject val = JvGetObjectField (obj, field);
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
p = (GC_PTR) val;
|
2004-11-25 04:47:08 +01:00
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, obj);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
natConstructor.cc (newInstance): Use _Jv_CallAnyMethodA.
* java/lang/reflect/natConstructor.cc (newInstance): Use
_Jv_CallAnyMethodA.
* include/jvm.h: Declare _Jv_CallAnyMethodA.
* java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Renamed
from _Jv_CallNonvirtualMethodA. Changed interface; overloaded.
Include <jni.h>.
(COPY): Removed.
(invoke): Use _Jv_CallAnyMethodA.
(VAL): Redefined.
* java/lang/Class.h (Class): Declare JvGetFirstStaticField,
JvNumStaticFields, JvNumMethods, and JvGetFirstMethod as friend
functions.
(struct _Jv_Method): Added getNextMethod method.
(JvNumMethods): New function.
(JvGetFirstMethod): Likewise.
* gcj/field.h (JvGetFirstStaticField): New function.
(JvNumStaticFields): Likewise.
(getNextField): Renamed from getNextInstanceField.
(struct _Jv_Field): New method getClass.
* jni.cc: Wrote many new functions.
* include/jni.h (JNI_TRUE): Define.
(JNI_FALSE): Likewise.
(jobject, jclass, jstring, jarray, jthrowable, jobjectArray,
jbyteArray, jshortArray, jintArray, jlongArray, jbooleanArray,
jcharArray, jfloatArray, jdoubleArray): New typedefs.
(jfieldID, jmethodID): Likewise.
(JNI_COMMIT, JNI_ABORT): New defines.
(JNINativeMethod): New struct.
(struct JNINativeInterface): Correctly declared more entries.
(class _Jv_JNIEnv): Added `ex' member.
(JNI_VERSION_1_1): New define.
(JNI_VERSION_1_2): Likewise.
* boehm.cc (_Jv_MarkObj): Use getNextField, not
getNextInstanceField.
From-SVN: r31553
2000-01-22 00:50:31 +01:00
|
|
|
|
field = field->getNextField ();
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
klass = klass->getSuperclass();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return mark_stack_ptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// This is called by the GC during the mark phase. It marks a Java
|
|
|
|
|
// array (of objects). We use `void *' arguments and return, and not
|
|
|
|
|
// what the Boehm GC wants, to avoid pollution in our headers.
|
|
|
|
|
void *
|
2004-11-25 04:47:08 +01:00
|
|
|
|
_Jv_MarkArray (void *addr, void *msp, void *msl, void *env)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
struct GC_ms_entry *mark_stack_ptr = (struct GC_ms_entry *)msp;
|
|
|
|
|
struct GC_ms_entry *mark_stack_limit = (struct GC_ms_entry *)msl;
|
|
|
|
|
|
|
|
|
|
if (env == (void *)1) /* Object allocated with debug allocator. */
|
|
|
|
|
addr = (void *)GC_USR_PTR_FROM_BASE(addr);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
jobjectArray array = (jobjectArray) addr;
|
|
|
|
|
|
|
|
|
|
_Jv_VTable *dt = *(_Jv_VTable **) addr;
|
2000-09-30 11:56:58 +02:00
|
|
|
|
// Assumes size >= 3 words. That's currently true since arrays have
|
|
|
|
|
// a vtable, sync pointer, and size. If the sync pointer goes away,
|
|
|
|
|
// we may need to round up the size.
|
|
|
|
|
if (__builtin_expect (! dt || !(dt -> get_finalizer()), false))
|
1999-04-07 16:42:40 +02:00
|
|
|
|
return mark_stack_ptr;
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
GC_PTR p;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
2006-02-08 21:07:29 +01:00
|
|
|
|
p = (GC_PTR) dt;
|
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, array);
|
|
|
|
|
|
2001-05-24 07:40:37 +02:00
|
|
|
|
# ifndef JV_HASH_SYNCHRONIZATION
|
|
|
|
|
// Every object has a sync_info pointer.
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
p = (GC_PTR) array->sync_info;
|
2004-11-25 04:47:08 +01:00
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, array);
|
2001-05-24 07:40:37 +02:00
|
|
|
|
# endif
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
|
for (int i = 0; i < JvGetArrayLength (array); ++i)
|
|
|
|
|
{
|
|
|
|
|
jobject obj = elements (array)[i];
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
p = (GC_PTR) obj;
|
2004-11-25 04:47:08 +01:00
|
|
|
|
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, array);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return mark_stack_ptr;
|
|
|
|
|
}
|
|
|
|
|
|
2001-12-19 03:45:20 +01:00
|
|
|
|
// Generate a GC marking descriptor for a class.
|
|
|
|
|
//
|
2000-09-30 11:56:58 +02:00
|
|
|
|
// We assume that the gcj mark proc has index 0. This is a dubious assumption,
|
|
|
|
|
// since another one could be registered first. But the compiler also
|
|
|
|
|
// knows this, so in that case everything else will break, too.
|
2001-05-21 10:37:04 +02:00
|
|
|
|
#define GCJ_DEFAULT_DESCR GC_MAKE_PROC(GC_GCJ_RESERVED_MARK_PROC_INDEX,0)
|
2003-07-23 11:53:53 +02:00
|
|
|
|
|
2000-09-30 11:56:58 +02:00
|
|
|
|
void *
|
2003-07-23 11:53:53 +02:00
|
|
|
|
_Jv_BuildGCDescr(jclass self)
|
2000-09-30 11:56:58 +02:00
|
|
|
|
{
|
2003-07-23 11:53:53 +02:00
|
|
|
|
jlong desc = 0;
|
2003-09-29 09:13:40 +02:00
|
|
|
|
jint bits_per_word = CHAR_BIT * sizeof (void *);
|
2003-07-23 11:53:53 +02:00
|
|
|
|
|
|
|
|
|
// Note: for now we only consider a bitmap mark descriptor. We
|
|
|
|
|
// could also handle the case where the first N fields of a type are
|
|
|
|
|
// references. However, this is not very likely to be used by many
|
|
|
|
|
// classes, and it is easier to compute things this way.
|
|
|
|
|
|
2003-09-29 09:13:40 +02:00
|
|
|
|
// The vtable pointer.
|
|
|
|
|
desc |= 1ULL << (bits_per_word - 1);
|
|
|
|
|
#ifndef JV_HASH_SYNCHRONIZATION
|
|
|
|
|
// The sync_info field.
|
|
|
|
|
desc |= 1ULL << (bits_per_word - 2);
|
|
|
|
|
#endif
|
|
|
|
|
|
2003-07-23 11:53:53 +02:00
|
|
|
|
for (jclass klass = self; klass != NULL; klass = klass->getSuperclass())
|
|
|
|
|
{
|
|
|
|
|
jfieldID field = JvGetFirstInstanceField(klass);
|
|
|
|
|
int count = JvNumInstanceFields(klass);
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < count; ++i)
|
|
|
|
|
{
|
|
|
|
|
if (field->isRef())
|
|
|
|
|
{
|
|
|
|
|
unsigned int off = field->getOffset();
|
|
|
|
|
// If we run into a weird situation, we bail.
|
|
|
|
|
if (off % sizeof (void *) != 0)
|
|
|
|
|
return (void *) (GCJ_DEFAULT_DESCR);
|
|
|
|
|
off /= sizeof (void *);
|
|
|
|
|
// If we find a field outside the range of our bitmap,
|
2003-09-29 09:13:40 +02:00
|
|
|
|
// fall back to procedure marker. The bottom 2 bits are
|
|
|
|
|
// reserved.
|
2004-11-25 04:47:08 +01:00
|
|
|
|
if (off >= (unsigned) bits_per_word - 2)
|
2003-07-23 11:53:53 +02:00
|
|
|
|
return (void *) (GCJ_DEFAULT_DESCR);
|
2003-09-29 09:13:40 +02:00
|
|
|
|
desc |= 1ULL << (bits_per_word - off - 1);
|
2003-07-23 11:53:53 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
field = field->getNextField();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// For bitmap mark type, bottom bits are 01.
|
|
|
|
|
desc |= 1;
|
|
|
|
|
// Bogus warning avoidance (on many platforms).
|
|
|
|
|
return (void *) (unsigned long) desc;
|
2000-09-30 11:56:58 +02:00
|
|
|
|
}
|
|
|
|
|
|
2001-05-24 07:40:37 +02:00
|
|
|
|
// Allocate some space that is known to be pointer-free.
|
1999-04-07 16:42:40 +02:00
|
|
|
|
void *
|
2001-05-24 07:40:37 +02:00
|
|
|
|
_Jv_AllocBytes (jsize size)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
2001-05-24 07:40:37 +02:00
|
|
|
|
void *r = GC_MALLOC_ATOMIC (size);
|
|
|
|
|
// We have to explicitly zero memory here, as the GC doesn't
|
|
|
|
|
// guarantee that PTRFREE allocations are zeroed. Note that we
|
|
|
|
|
// don't have to do this for other allocation types because we set
|
|
|
|
|
// the `ok_init' flag in the type descriptor.
|
|
|
|
|
memset (r, 0, size);
|
|
|
|
|
return r;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
#ifdef LIBGCJ_GC_DEBUG
|
|
|
|
|
|
|
|
|
|
void *
|
|
|
|
|
_Jv_AllocObj (jsize size, jclass klass)
|
|
|
|
|
{
|
|
|
|
|
return GC_GCJ_MALLOC (size, klass->vtable);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void *
|
|
|
|
|
_Jv_AllocPtrFreeObj (jsize size, jclass klass)
|
|
|
|
|
{
|
|
|
|
|
#ifdef JV_HASH_SYNCHRONIZATION
|
|
|
|
|
void * obj = GC_MALLOC_ATOMIC(size);
|
|
|
|
|
*((_Jv_VTable **) obj) = klass->vtable;
|
|
|
|
|
#else
|
|
|
|
|
void * obj = GC_GCJ_MALLOC(size, klass->vtable);
|
|
|
|
|
#endif
|
|
|
|
|
return obj;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* LIBGCJ_GC_DEBUG */
|
|
|
|
|
// In the non-debug case, the above two functions are defined
|
|
|
|
|
// as inline functions in boehm-gc.h. In the debug case we
|
|
|
|
|
// really want to take advantage of the definitions in gc_gcj.h.
|
|
|
|
|
|
2000-09-30 11:56:58 +02:00
|
|
|
|
// Allocate space for a new Java array.
|
|
|
|
|
// Used only for arrays of objects.
|
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
|
|
|
|
{
|
2000-09-30 11:56:58 +02:00
|
|
|
|
void *obj;
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
|
|
|
|
|
#ifdef LIBGCJ_GC_DEBUG
|
|
|
|
|
// There isn't much to lose by scanning this conservatively.
|
|
|
|
|
// If we didn't, the mark proc would have to understand that
|
|
|
|
|
// it needed to skip the header.
|
|
|
|
|
obj = GC_MALLOC(size);
|
|
|
|
|
#else
|
2000-09-30 11:56:58 +02:00
|
|
|
|
const jsize min_heap_addr = 16*1024;
|
|
|
|
|
// A heuristic. If size is less than this value, the size
|
|
|
|
|
// stored in the array can't possibly be misinterpreted as
|
|
|
|
|
// a pointer. Thus we lose nothing by scanning the object
|
|
|
|
|
// completely conservatively, since no misidentification can
|
|
|
|
|
// take place.
|
|
|
|
|
|
|
|
|
|
if (size < min_heap_addr)
|
|
|
|
|
obj = GC_MALLOC(size);
|
|
|
|
|
else
|
2001-08-18 03:01:51 +02:00
|
|
|
|
obj = GC_generic_malloc (size, array_kind_x);
|
2000-09-30 11:56:58 +02:00
|
|
|
|
#endif
|
|
|
|
|
*((_Jv_VTable **) obj) = klass->vtable;
|
|
|
|
|
return obj;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
2001-09-10 03:21:08 +02:00
|
|
|
|
/* Allocate space for a new non-Java object, which does not have the usual
|
|
|
|
|
Java object header but may contain pointers to other GC'ed objects. */
|
|
|
|
|
void *
|
|
|
|
|
_Jv_AllocRawObj (jsize size)
|
|
|
|
|
{
|
2006-02-08 21:07:29 +01:00
|
|
|
|
return (void *) GC_MALLOC (size ? size : 1);
|
2001-09-10 03:21:08 +02:00
|
|
|
|
}
|
|
|
|
|
|
configure.ac (INTERPRETER): New AM_CONDITIONAL.
* configure.ac (INTERPRETER): New AM_CONDITIONAL.
* scripts/makemake.tcl (package_map): Mark jdwp and jvmti packages
as being for interpreter only. Place interpreter related files in
'if INTERPRETER' block.
(interpreter_package_files): New list.
(interpreter_header_vars): Ditto.
(emit_package_rule_to_list): Renamed from emit_package_rule with
new target list parameter.
(emit_package_rule): Rewritten to call emit_package_rule_to_list.
(emit_interpreter_rule): New function.
(emit_source_var): Place interpreter related files in
interpreter_header_vars.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I libltdl.
(libgcj_interpret_source_files): New variable.
(libgcj_la_SOURCES): Move jvmti.cc and interpret.cc to
libgcj_interpret_source_files and include
libgcj_interpret_source_files.
(nat_jdwp_source_files): New variable.
(nat_jvmti_source_files): Ditto.
(nat_source_files): Move jdwp and jvmti related files to
nat_jdwp_source_files and nat_jvmti_source_files and include
nat_jdwp_source_files and nat_jvmti_source_files.
* Makefile.in: Regenerate.
* include/Makefile.in: Ditto.
* testsuite/Makefile.in: Ditto.
* gcj/Makefile.in: Ditto.
* sources.am: Ditto.
* configure: Ditto.
* include/config.h.in: Ditto.
* interpret.cc: Remove #ifdef INTERPRETER block.
* stacktrace.cc (UnwindTraceFn): Do not handle proxy frames if
interpreter disabled.
* include/java-interp.h (_Jv_FrameType): Move outside of
#ifdef INTERPRETER block.
* include/execution.h (_Jv_IndirectCompiledEngine::do_get_closure_list,
_Jv_InterpreterEngine, _Jv_soleInterpreterEngine): Place in
#ifdef INTERPRETER block.
* jni.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_JNI_PopSystemFrame, _Jv_JNI_GetEnv): Only do jvmti processing
if INTERPRETER is defined.
* prims.cc (jvmti.h, jvmti-int.h, Jdwp.h, VMVirtualMachine.h): Only
include if INTERPRETER is defined.
(defaultJdwpOptions, jdwpOptions, jvmti_agent_onload_func,
jvmti_agent_onunload_func, jvmti_agentonload, jvmti_agentonunload,
jvmti_agent_opts, load_jvmti_agent): Only define if INTERPRETER is
defined.
(parse_x_arg): Only process 'runjdwp:' if INTERPRETER is defined.
(parse_init_args): Only process jvmti related options if
INTERPRETER is defined.
(_Jv_CreateJavaVM): Only call _Jv_JVMTI_Init if INTERPRETER is
defined.
(_Jv_RunMain): Only do jvmti and jdwp processing if INTERPRETER is
defined.
* link.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_ThrowNoClassDefFoundError, _Jv_Linker::create_error_method):
Define if if INTERPRETER is not defined.
(_Jv_Linker::wait_for_state): Only do jvmti proccessing if
INTERPRETER is defined.
* boehm.cc (closure_list_pointer, finalize_closure_list,
_Jv_ClosureListFinalizer): Only define if INTERPRETER is
defined.
* java/lang/natThread.cc (jvmti.h, jvmti-int.h): Only include if
INTERPRETER is defined.
(finish_, _Jv_NotifyThreadStart): Only do jvmti proccessing if
INTERPRETER is defined.
* java/lang/Class.h (_Jv_InterpreterEngine): Move declaration
and friend declaration inside #ifdef INTERPRETER block.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures,
_Jv_ClosureList::registerClosure, _Jv_GetInterpClassSourceFile):
Only define if INTERPRETER is defined.
* java/lang/reflect/natVMProxy.cc (UnsupportedOperationException.h):
Include.
(generateProxyClass): Throw UnsupportedOperationException unless
INTERPRETER is defined.
From-SVN: r127097
2007-07-31 18:17:21 +02:00
|
|
|
|
#ifdef INTERPRETER
|
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
|
|
|
|
typedef _Jv_ClosureList *closure_list_pointer;
|
|
|
|
|
|
|
|
|
|
/* Release closures in a _Jv_ClosureList. */
|
|
|
|
|
static void
|
|
|
|
|
finalize_closure_list (GC_PTR obj, GC_PTR)
|
|
|
|
|
{
|
|
|
|
|
_Jv_ClosureList **clpp = (_Jv_ClosureList **)obj;
|
|
|
|
|
_Jv_ClosureList::releaseClosures (clpp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Allocate a double-indirect pointer to a _Jv_ClosureList that will
|
|
|
|
|
get garbage-collected after this double-indirect pointer becomes
|
|
|
|
|
unreachable by any other objects, including finalizable ones. */
|
|
|
|
|
_Jv_ClosureList **
|
|
|
|
|
_Jv_ClosureListFinalizer ()
|
|
|
|
|
{
|
|
|
|
|
_Jv_ClosureList **clpp;
|
|
|
|
|
clpp = (_Jv_ClosureList **)_Jv_AllocBytes (sizeof (*clpp));
|
|
|
|
|
GC_REGISTER_FINALIZER_UNREACHABLE (clpp, finalize_closure_list,
|
|
|
|
|
NULL, NULL, NULL);
|
|
|
|
|
return clpp;
|
|
|
|
|
}
|
configure.ac (INTERPRETER): New AM_CONDITIONAL.
* configure.ac (INTERPRETER): New AM_CONDITIONAL.
* scripts/makemake.tcl (package_map): Mark jdwp and jvmti packages
as being for interpreter only. Place interpreter related files in
'if INTERPRETER' block.
(interpreter_package_files): New list.
(interpreter_header_vars): Ditto.
(emit_package_rule_to_list): Renamed from emit_package_rule with
new target list parameter.
(emit_package_rule): Rewritten to call emit_package_rule_to_list.
(emit_interpreter_rule): New function.
(emit_source_var): Place interpreter related files in
interpreter_header_vars.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I libltdl.
(libgcj_interpret_source_files): New variable.
(libgcj_la_SOURCES): Move jvmti.cc and interpret.cc to
libgcj_interpret_source_files and include
libgcj_interpret_source_files.
(nat_jdwp_source_files): New variable.
(nat_jvmti_source_files): Ditto.
(nat_source_files): Move jdwp and jvmti related files to
nat_jdwp_source_files and nat_jvmti_source_files and include
nat_jdwp_source_files and nat_jvmti_source_files.
* Makefile.in: Regenerate.
* include/Makefile.in: Ditto.
* testsuite/Makefile.in: Ditto.
* gcj/Makefile.in: Ditto.
* sources.am: Ditto.
* configure: Ditto.
* include/config.h.in: Ditto.
* interpret.cc: Remove #ifdef INTERPRETER block.
* stacktrace.cc (UnwindTraceFn): Do not handle proxy frames if
interpreter disabled.
* include/java-interp.h (_Jv_FrameType): Move outside of
#ifdef INTERPRETER block.
* include/execution.h (_Jv_IndirectCompiledEngine::do_get_closure_list,
_Jv_InterpreterEngine, _Jv_soleInterpreterEngine): Place in
#ifdef INTERPRETER block.
* jni.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_JNI_PopSystemFrame, _Jv_JNI_GetEnv): Only do jvmti processing
if INTERPRETER is defined.
* prims.cc (jvmti.h, jvmti-int.h, Jdwp.h, VMVirtualMachine.h): Only
include if INTERPRETER is defined.
(defaultJdwpOptions, jdwpOptions, jvmti_agent_onload_func,
jvmti_agent_onunload_func, jvmti_agentonload, jvmti_agentonunload,
jvmti_agent_opts, load_jvmti_agent): Only define if INTERPRETER is
defined.
(parse_x_arg): Only process 'runjdwp:' if INTERPRETER is defined.
(parse_init_args): Only process jvmti related options if
INTERPRETER is defined.
(_Jv_CreateJavaVM): Only call _Jv_JVMTI_Init if INTERPRETER is
defined.
(_Jv_RunMain): Only do jvmti and jdwp processing if INTERPRETER is
defined.
* link.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_ThrowNoClassDefFoundError, _Jv_Linker::create_error_method):
Define if if INTERPRETER is not defined.
(_Jv_Linker::wait_for_state): Only do jvmti proccessing if
INTERPRETER is defined.
* boehm.cc (closure_list_pointer, finalize_closure_list,
_Jv_ClosureListFinalizer): Only define if INTERPRETER is
defined.
* java/lang/natThread.cc (jvmti.h, jvmti-int.h): Only include if
INTERPRETER is defined.
(finish_, _Jv_NotifyThreadStart): Only do jvmti proccessing if
INTERPRETER is defined.
* java/lang/Class.h (_Jv_InterpreterEngine): Move declaration
and friend declaration inside #ifdef INTERPRETER block.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures,
_Jv_ClosureList::registerClosure, _Jv_GetInterpClassSourceFile):
Only define if INTERPRETER is defined.
* java/lang/reflect/natVMProxy.cc (UnsupportedOperationException.h):
Include.
(generateProxyClass): Throw UnsupportedOperationException unless
INTERPRETER is defined.
From-SVN: r127097
2007-07-31 18:17:21 +02:00
|
|
|
|
#endif // INTERPRETER
|
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
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
static void
|
|
|
|
|
call_finalizer (GC_PTR obj, GC_PTR client_data)
|
|
|
|
|
{
|
|
|
|
|
_Jv_FinalizerFunc *fn = (_Jv_FinalizerFunc *) client_data;
|
|
|
|
|
jobject jobj = (jobject) obj;
|
|
|
|
|
|
|
|
|
|
(*fn) (jobj);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_Jv_RegisterFinalizer (void *object, _Jv_FinalizerFunc *meth)
|
|
|
|
|
{
|
1999-08-03 02:30:53 +02:00
|
|
|
|
GC_REGISTER_FINALIZER_NO_ORDER (object, call_finalizer, (GC_PTR) meth,
|
1999-04-07 16:42:40 +02:00
|
|
|
|
NULL, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_Jv_RunFinalizers (void)
|
|
|
|
|
{
|
|
|
|
|
GC_invoke_finalizers ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_Jv_RunAllFinalizers (void)
|
|
|
|
|
{
|
|
|
|
|
GC_finalize_all ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_Jv_RunGC (void)
|
|
|
|
|
{
|
|
|
|
|
GC_gcollect ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long
|
|
|
|
|
_Jv_GCTotalMemory (void)
|
|
|
|
|
{
|
|
|
|
|
return GC_get_heap_size ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long
|
|
|
|
|
_Jv_GCFreeMemory (void)
|
|
|
|
|
{
|
1999-11-02 01:12:10 +01:00
|
|
|
|
return GC_get_free_bytes ();
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
1999-10-22 21:43:41 +02:00
|
|
|
|
void
|
|
|
|
|
_Jv_GCSetInitialHeapSize (size_t size)
|
|
|
|
|
{
|
|
|
|
|
size_t current = GC_get_heap_size ();
|
|
|
|
|
if (size > current)
|
1999-11-05 18:34:32 +01:00
|
|
|
|
GC_expand_hp (size - current);
|
1999-10-22 21:43:41 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_Jv_GCSetMaximumHeapSize (size_t size)
|
|
|
|
|
{
|
|
|
|
|
GC_set_max_heap_size ((GC_word) size);
|
|
|
|
|
}
|
|
|
|
|
|
2007-10-22 23:24:35 +02:00
|
|
|
|
int
|
|
|
|
|
_Jv_SetGCFreeSpaceDivisor (int div)
|
|
|
|
|
{
|
|
|
|
|
return (int)GC_set_free_space_divisor ((GC_word)div);
|
|
|
|
|
}
|
|
|
|
|
|
2000-04-02 17:34:17 +02:00
|
|
|
|
void
|
|
|
|
|
_Jv_DisableGC (void)
|
|
|
|
|
{
|
|
|
|
|
GC_disable();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_Jv_EnableGC (void)
|
|
|
|
|
{
|
|
|
|
|
GC_enable();
|
|
|
|
|
}
|
|
|
|
|
|
2001-05-24 07:40:37 +02:00
|
|
|
|
static void * handle_out_of_memory(size_t)
|
|
|
|
|
{
|
|
|
|
|
_Jv_ThrowNoMemory();
|
|
|
|
|
}
|
|
|
|
|
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
static void
|
|
|
|
|
gcj_describe_type_fn(void *obj, char *out_buf)
|
|
|
|
|
{
|
|
|
|
|
_Jv_VTable *dt = *(_Jv_VTable **) obj;
|
|
|
|
|
|
|
|
|
|
if (! dt /* Shouldn't happen */)
|
|
|
|
|
{
|
|
|
|
|
strcpy(out_buf, "GCJ (bad)");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
jclass klass = dt->clas;
|
|
|
|
|
if (!klass /* shouldn't happen */)
|
|
|
|
|
{
|
|
|
|
|
strcpy(out_buf, "GCJ (bad)");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
jstring name = klass -> getName();
|
|
|
|
|
size_t len = name -> length();
|
|
|
|
|
if (len >= GC_TYPE_DESCR_LEN) len = GC_TYPE_DESCR_LEN - 1;
|
|
|
|
|
JvGetStringUTFRegion (name, 0, len, out_buf);
|
|
|
|
|
out_buf[len] = '\0';
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
void
|
|
|
|
|
_Jv_InitGC (void)
|
|
|
|
|
{
|
|
|
|
|
int proc;
|
2006-04-24 17:33:16 +02:00
|
|
|
|
static bool gc_initialized;
|
|
|
|
|
|
|
|
|
|
if (gc_initialized)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
gc_initialized = 1;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
2002-02-12 05:14:52 +01:00
|
|
|
|
// Ignore pointers that do not point to the start of an object.
|
|
|
|
|
GC_all_interior_pointers = 0;
|
2000-09-30 11:56:58 +02:00
|
|
|
|
|
2006-05-01 18:28:42 +02:00
|
|
|
|
#if defined (HAVE_DLFCN_H) && defined (HAVE_DLADDR)
|
2006-04-24 17:33:16 +02:00
|
|
|
|
// Tell the collector to ask us before scanning DSOs.
|
|
|
|
|
GC_register_has_static_roots_callback (_Jv_GC_has_static_roots);
|
|
|
|
|
#endif
|
|
|
|
|
|
2000-09-30 11:56:58 +02:00
|
|
|
|
// Configure the collector to use the bitmap marking descriptors that we
|
|
|
|
|
// stash in the class vtable.
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
// We always use mark proc descriptor 0, since the compiler knows
|
|
|
|
|
// about it.
|
2000-09-30 11:56:58 +02:00
|
|
|
|
GC_init_gcj_malloc (0, (void *) _Jv_MarkObj);
|
|
|
|
|
|
2001-05-24 07:40:37 +02:00
|
|
|
|
// Cause an out of memory error to be thrown from the allocators,
|
|
|
|
|
// instead of returning 0. This is cheaper than checking on allocation.
|
|
|
|
|
GC_oom_fn = handle_out_of_memory;
|
|
|
|
|
|
2000-09-30 11:56:58 +02:00
|
|
|
|
GC_java_finalization = 1;
|
|
|
|
|
|
|
|
|
|
// We use a different mark procedure for object arrays. This code
|
|
|
|
|
// configures a different object `kind' for object array allocation and
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
// marking.
|
|
|
|
|
array_free_list = GC_new_free_list();
|
|
|
|
|
proc = GC_new_proc((GC_mark_proc)_Jv_MarkArray);
|
|
|
|
|
array_kind_x = GC_new_kind(array_free_list, GC_MAKE_PROC (proc, 0), 0, 1);
|
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
// Arrange to have the GC print Java class names in backtraces, etc.
|
configure.ac: Handle --enable-gc-debug.
* configure.ac: Handle --enable-gc-debug.
* configure: Regenerate.
* include/config.h.in (LIBGCJ_GC_DEBUG): Add.
* boehm.cc: Include gc_mark.h, javaxfc.h, but no GC private files.
Rearrange include file order.
(GC_DEBUG): Set if LIBGCJ_GC_DEBUG is set.
(GC_finalize_all, GC_debug_generic_malloc): Don't declare.
(disable_gc_mutex): Delete along with all references.
(_Jv_MarkObj, _Jv_MarkArray): Use public types,
adjust for debug header size.
(_Jv_AllocObj, _Jv_allocPtrFreeObj): Define out of line for
debug case.
(_Jv_AllocArray): Declare min_heap_addr only if needed.
(gcj_describe_type_fn): New.
(_Jv_InitGC): Use GC_new_free_list, GC_new_proc, and GC_new_kind.
Register gcj_describe_type_fn.
* include/boehm-gc.h:
(_Jv_AllocObj, _Jv_allocPtrFreeObj):
Don't define, but declare, for debug case.
* java/lang/natObject.cc:
(GC_DEBUG): Define if LIBGCJ_GC_DEBUG is set.
From-SVN: r86686
2004-08-28 02:45:56 +02:00
|
|
|
|
GC_register_describe_type_fn(GC_gcj_kind, gcj_describe_type_fn);
|
|
|
|
|
GC_register_describe_type_fn(GC_gcj_debug_kind, gcj_describe_type_fn);
|
2000-09-30 11:56:58 +02:00
|
|
|
|
}
|
|
|
|
|
|
2001-05-24 07:40:37 +02:00
|
|
|
|
#ifdef JV_HASH_SYNCHRONIZATION
|
|
|
|
|
// Allocate an object with a fake vtable pointer, which causes only
|
|
|
|
|
// the first field (beyond the fake vtable pointer) to be traced.
|
|
|
|
|
// Eventually this should probably be generalized.
|
|
|
|
|
|
|
|
|
|
static _Jv_VTable trace_one_vtable = {
|
|
|
|
|
0, // class pointer
|
|
|
|
|
(void *)(2 * sizeof(void *)),
|
|
|
|
|
// descriptor; scan 2 words incl. vtable ptr.
|
|
|
|
|
// Least significant bits must be zero to
|
2001-10-16 00:42:42 +02:00
|
|
|
|
// identify this as a length descriptor
|
2001-05-24 07:40:37 +02:00
|
|
|
|
{0} // First method
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
void *
|
|
|
|
|
_Jv_AllocTraceOne (jsize size /* includes vtable slot */)
|
|
|
|
|
{
|
|
|
|
|
return GC_GCJ_MALLOC (size, &trace_one_vtable);
|
|
|
|
|
}
|
|
|
|
|
|
2001-10-16 00:42:42 +02:00
|
|
|
|
// Ditto for two words.
|
|
|
|
|
// the first field (beyond the fake vtable pointer) to be traced.
|
|
|
|
|
// Eventually this should probably be generalized.
|
|
|
|
|
|
|
|
|
|
static _Jv_VTable trace_two_vtable =
|
|
|
|
|
{
|
|
|
|
|
0, // class pointer
|
|
|
|
|
(void *)(3 * sizeof(void *)),
|
|
|
|
|
// descriptor; scan 3 words incl. vtable ptr.
|
|
|
|
|
{0} // First method
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
void *
|
|
|
|
|
_Jv_AllocTraceTwo (jsize size /* includes vtable slot */)
|
|
|
|
|
{
|
|
|
|
|
return GC_GCJ_MALLOC (size, &trace_two_vtable);
|
|
|
|
|
}
|
|
|
|
|
|
2001-05-24 07:40:37 +02:00
|
|
|
|
#endif /* JV_HASH_SYNCHRONIZATION */
|
|
|
|
|
|
2001-10-11 00:25:43 +02:00
|
|
|
|
void
|
|
|
|
|
_Jv_GCInitializeFinalizers (void (*notifier) (void))
|
|
|
|
|
{
|
|
|
|
|
GC_finalize_on_demand = 1;
|
|
|
|
|
GC_finalizer_notifier = notifier;
|
|
|
|
|
}
|
|
|
|
|
|
2001-10-02 16:31:47 +02:00
|
|
|
|
void
|
|
|
|
|
_Jv_GCRegisterDisappearingLink (jobject *objp)
|
|
|
|
|
{
|
2004-11-25 04:47:08 +01:00
|
|
|
|
// This test helps to ensure that we meet a precondition of
|
|
|
|
|
// GC_general_register_disappearing_link, viz. "Obj must be a
|
|
|
|
|
// pointer to the first word of an object we allocated."
|
|
|
|
|
if (GC_base(*objp))
|
|
|
|
|
GC_general_register_disappearing_link ((GC_PTR *) objp, (GC_PTR) *objp);
|
2001-10-02 16:31:47 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jboolean
|
2001-11-12 11:42:45 +01:00
|
|
|
|
_Jv_GCCanReclaimSoftReference (jobject)
|
2001-10-02 16:31:47 +02:00
|
|
|
|
{
|
|
|
|
|
// For now, always reclaim soft references. FIXME.
|
|
|
|
|
return true;
|
|
|
|
|
}
|
2006-04-24 17:33:16 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2006-05-01 18:28:42 +02:00
|
|
|
|
#if defined (HAVE_DLFCN_H) && defined (HAVE_DLADDR)
|
2006-04-24 17:33:16 +02:00
|
|
|
|
|
|
|
|
|
// We keep a store of the filenames of DSOs that need to be
|
|
|
|
|
// conservatively scanned by the garbage collector. During collection
|
|
|
|
|
// the gc calls _Jv_GC_has_static_roots() to see if the data segment
|
|
|
|
|
// of a DSO should be scanned.
|
|
|
|
|
typedef struct filename_node
|
|
|
|
|
{
|
|
|
|
|
char *name;
|
|
|
|
|
struct filename_node *link;
|
|
|
|
|
} filename_node;
|
|
|
|
|
|
|
|
|
|
#define FILENAME_STORE_SIZE 17
|
|
|
|
|
static filename_node *filename_store[FILENAME_STORE_SIZE];
|
|
|
|
|
|
|
|
|
|
// Find a filename in filename_store.
|
|
|
|
|
static filename_node **
|
|
|
|
|
find_file (const char *filename)
|
|
|
|
|
{
|
|
|
|
|
int index = strlen (filename) % FILENAME_STORE_SIZE;
|
|
|
|
|
filename_node **node = &filename_store[index];
|
|
|
|
|
|
|
|
|
|
while (*node)
|
|
|
|
|
{
|
|
|
|
|
if (strcmp ((*node)->name, filename) == 0)
|
|
|
|
|
return node;
|
|
|
|
|
node = &(*node)->link;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return node;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Print the store of filenames of DSOs that need collection.
|
|
|
|
|
void
|
|
|
|
|
_Jv_print_gc_store (void)
|
|
|
|
|
{
|
|
|
|
|
for (int i = 0; i < FILENAME_STORE_SIZE; i++)
|
|
|
|
|
{
|
|
|
|
|
filename_node *node = filename_store[i];
|
|
|
|
|
while (node)
|
|
|
|
|
{
|
|
|
|
|
fprintf (stderr, "%s\n", node->name);
|
|
|
|
|
node = node->link;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Create a new node in the store of libraries to collect.
|
|
|
|
|
static filename_node *
|
|
|
|
|
new_node (const char *filename)
|
|
|
|
|
{
|
|
|
|
|
filename_node *node = (filename_node*)_Jv_Malloc (sizeof (filename_node));
|
|
|
|
|
node->name = (char *)_Jv_Malloc (strlen (filename) + 1);
|
|
|
|
|
node->link = NULL;
|
|
|
|
|
strcpy (node->name, filename);
|
|
|
|
|
|
|
|
|
|
return node;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Nonzero if the gc should scan this lib.
|
|
|
|
|
static int
|
|
|
|
|
_Jv_GC_has_static_roots (const char *filename, void *, size_t)
|
|
|
|
|
{
|
|
|
|
|
if (filename == NULL || strlen (filename) == 0)
|
|
|
|
|
// No filename; better safe than sorry.
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
filename_node **node = find_file (filename);
|
|
|
|
|
if (*node)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
// Register the DSO that contains p for collection.
|
|
|
|
|
void
|
|
|
|
|
_Jv_RegisterLibForGc (const void *p __attribute__ ((__unused__)))
|
|
|
|
|
{
|
2006-05-01 18:28:42 +02:00
|
|
|
|
#if defined (HAVE_DLFCN_H) && defined (HAVE_DLADDR)
|
2006-04-24 17:33:16 +02:00
|
|
|
|
Dl_info info;
|
2006-04-25 13:54:15 +02:00
|
|
|
|
|
|
|
|
|
if (dladdr (const_cast<void *>(p), &info) != 0)
|
2006-04-24 17:33:16 +02:00
|
|
|
|
{
|
|
|
|
|
filename_node **node = find_file (info.dli_fname);
|
|
|
|
|
if (! *node)
|
|
|
|
|
*node = new_node (info.dli_fname);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-26 18:31:06 +02:00
|
|
|
|
void
|
|
|
|
|
_Jv_SuspendThread (_Jv_Thread_t *thread)
|
|
|
|
|
{
|
2006-07-22 01:45:03 +02:00
|
|
|
|
#if defined(GC_PTHREADS) && !defined(GC_SOLARIS_THREADS) \
|
|
|
|
|
&& !defined(GC_WIN32_THREADS) && !defined(GC_DARWIN_THREADS)
|
2006-06-26 18:31:06 +02:00
|
|
|
|
GC_suspend_thread (_Jv_GetPlatformThreadID (thread));
|
2006-07-22 01:45:03 +02:00
|
|
|
|
#endif
|
2006-06-26 18:31:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_Jv_ResumeThread (_Jv_Thread_t *thread)
|
|
|
|
|
{
|
2006-07-22 01:45:03 +02:00
|
|
|
|
#if defined(GC_PTHREADS) && !defined(GC_SOLARIS_THREADS) \
|
|
|
|
|
&& !defined(GC_WIN32_THREADS) && !defined(GC_DARWIN_THREADS)
|
2006-06-26 18:31:06 +02:00
|
|
|
|
GC_resume_thread (_Jv_GetPlatformThreadID (thread));
|
2006-06-27 19:34:23 +02:00
|
|
|
|
#endif
|
2006-07-22 01:45:03 +02:00
|
|
|
|
}
|
2006-08-22 00:07:30 +02:00
|
|
|
|
|
2007-04-23 23:12:10 +02:00
|
|
|
|
int
|
|
|
|
|
_Jv_IsThreadSuspended (_Jv_Thread_t *thread)
|
|
|
|
|
{
|
|
|
|
|
#if defined(GC_PTHREADS) && !defined(GC_SOLARIS_THREADS) \
|
|
|
|
|
&& !defined(GC_WIN32_THREADS) && !defined(GC_DARWIN_THREADS)
|
|
|
|
|
return GC_is_thread_suspended (_Jv_GetPlatformThreadID (thread));
|
|
|
|
|
#else
|
|
|
|
|
return 0;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2006-08-22 00:07:30 +02:00
|
|
|
|
void
|
|
|
|
|
_Jv_GCAttachThread ()
|
|
|
|
|
{
|
|
|
|
|
// The registration interface is only defined on posixy systems and
|
|
|
|
|
// only actually works if pthread_getattr_np is defined.
|
2006-09-14 20:06:04 +02:00
|
|
|
|
// FIXME: until gc7 it is simpler to disable this on solaris.
|
2014-05-13 18:23:11 +02:00
|
|
|
|
#if defined(HAVE_PTHREAD_GETATTR_NP) && !defined(GC_SOLARIS_THREADS) \
|
|
|
|
|
&& !defined(GC_WIN32_THREADS)
|
2006-08-22 00:07:30 +02:00
|
|
|
|
GC_register_my_thread ();
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_Jv_GCDetachThread ()
|
|
|
|
|
{
|
2014-05-13 18:23:11 +02:00
|
|
|
|
#if defined(HAVE_PTHREAD_GETATTR_NP) && !defined(GC_SOLARIS_THREADS) \
|
|
|
|
|
&& !defined(GC_WIN32_THREADS)
|
2006-08-22 00:07:30 +02:00
|
|
|
|
GC_unregister_my_thread ();
|
|
|
|
|
#endif
|
|
|
|
|
}
|