diff options
| -rw-r--r-- | boehm-gc/ChangeLog | 5 | ||||
| -rw-r--r-- | boehm-gc/dyn_load.c | 18 | ||||
| -rw-r--r-- | boehm-gc/include/gc.h | 9 |
3 files changed, 31 insertions, 1 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 936d3bfc233..a27b9f3518d 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,8 @@ +2006-03-07 Andrew Haley <aph@redhat.com> + + * dyn_load.c (GC_has_static_roots): Declare. + (GC_register_dynlib_callback): Call GC_has_static_roots. + 2006-04-11 Bryce McKinlay <mckinlay@redhat.com> * darwin_stop_world.c (GC_push_all_stacks, GC_stop_world, diff --git a/boehm-gc/dyn_load.c b/boehm-gc/dyn_load.c index 749bf824681..94e66092e31 100644 --- a/boehm-gc/dyn_load.c +++ b/boehm-gc/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/boehm-gc/include/gc.h b/boehm-gc/include/gc.h index cfc8658ac39..3507db74dc5 100644 --- a/boehm-gc/include/gc.h +++ b/boehm-gc/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 <windows.h> |