From: aph Date: Mon, 24 Apr 2006 13:40:21 +0000 (+0000) Subject: 2006-03-07 Andrew Haley X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b253ef36ab5ec6c3f0e7681c6cdd76002e5c2ec0;p=gc 2006-03-07 Andrew Haley * dyn_load.c (GC_has_static_roots): Declare. (GC_register_dynlib_callback): Call GC_has_static_roots. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113223 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/ChangeLog b/ChangeLog index 936d3bfc..a27b9f35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-03-07 Andrew Haley + + * dyn_load.c (GC_has_static_roots): Declare. + (GC_register_dynlib_callback): Call GC_has_static_roots. + 2006-04-11 Bryce McKinlay * darwin_stop_world.c (GC_push_all_stacks, GC_stop_world, diff --git a/dyn_load.c b/dyn_load.c index 749bf824..94e66092 100644 --- a/dyn_load.c +++ b/dyn_load.c @@ -119,6 +119,17 @@ # endif # endif +/* An user-supplied routine that is called to dtermine if a DSO must + be scanned by the gc. */ +static int (*GC_has_static_roots)(const char *, void *, size_t); +/* Register the routine. */ +void +GC_register_has_static_roots_callback + (int (*callback)(const char *, void *, size_t)) +{ + GC_has_static_roots = callback; +} + #if defined(SUNOS5DL) && !defined(USE_PROC_FOR_LIBRARIES) #ifdef LINT @@ -371,7 +382,7 @@ GC_bool GC_register_main_static_data() { return FALSE; } - + # define HAVE_REGISTER_MAIN_STATIC_DATA #endif /* USE_PROC_FOR_LIBRARIES */ @@ -411,6 +422,11 @@ static int GC_register_dynlib_callback(info, size, ptr) { if( !(p->p_flags & PF_W) ) break; start = ((char *)(p->p_vaddr)) + info->dlpi_addr; + + if (GC_has_static_roots + && !GC_has_static_roots(info->dlpi_name, start, p->p_memsz)) + break; + GC_add_roots_inner(start, start + p->p_memsz, TRUE); } break; diff --git a/include/gc.h b/include/gc.h index cfc8658a..3507db74 100644 --- a/include/gc.h +++ b/include/gc.h @@ -925,6 +925,15 @@ extern void GC_thr_init GC_PROTO((void));/* Needed for Solaris/X86 */ #endif /* THREADS && !SRC_M3 */ +/* Register a callback to control the scanning of dynamic libraries. + When the GC scans the static data of a dynamic library, it will + first call a user-supplied routine with filename of the library and + the address and length of the memory region. This routine should + return nonzero if that region should be scanned. */ +GC_API void GC_register_has_static_roots_callback + (int (*callback)(const char *, void *, size_t)); + + #if defined(GC_WIN32_THREADS) && !defined(__CYGWIN32__) && !defined(__CYGWIN__) # include