diff options
| author | ivmai <ivmai> | 2009-10-17 21:54:30 +0000 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2011-07-26 21:06:50 +0400 |
| commit | 11c6f7c1b400b8fbfaede7e68a823776547132c5 (patch) | |
| tree | 4a56ce03f9b09192e17efb1da4c94a36fdd38a33 /gc_dlopen.c | |
| parent | 7c565a1e61c34529f3b498d580018f6e902945d5 (diff) | |
| download | bdwgc-11c6f7c1b400b8fbfaede7e68a823776547132c5.tar.gz | |
2009-10-17 Ivan Maidanski <ivmai@mail.ru>
* gc_dlopen.c (GC_MUST_RESTORE_REDEFINED_DLOPEN): Define if dlopen
redirection is turned off; turn it on later when dlopen real
symbol is no longer needed (according to the comment and the same
as in dyn_load.c).
* gc_dlopen.c (WRAP_FUNC, REAL_FUNC): Rename to WRAP_DLFUNC and
REAL_DLFUNC, respectively (to have unique names since the
definitions may differ from that of the similar ones in
pthread_support.c).
* mark.c (source): Undefine the macro when no longer needed.
* os_dep.c (handler): Rename the type to GC_fault_handler_t (to
have the unique name across the project).
* os_dep.c (STAT_BUF_SIZE, STAT_READ); Guard with ifndef; add the
comment.
* pthread_support.c (STAT_BUF_SIZE, STAT_READ): Ditto.
* os_dep.c (sbrk): Undo sbrk() redirection (for ECOS) when no
longer needed.
Diffstat (limited to 'gc_dlopen.c')
| -rw-r--r-- | gc_dlopen.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/gc_dlopen.c b/gc_dlopen.c index 98c699f2..d8d6e1d9 100644 --- a/gc_dlopen.c +++ b/gc_dlopen.c @@ -28,6 +28,7 @@ # if (defined(GC_PTHREADS) && !defined(GC_DARWIN_THREADS)) && !defined(GC_WIN32_PTHREADS)\ || defined(GC_SOLARIS_THREADS) +# undef GC_MUST_RESTORE_REDEFINED_DLOPEN # if defined(dlopen) && !defined(GC_USE_LD_WRAP) /* To support various threads pkgs, gc.h interposes on dlopen by */ /* defining "dlopen" to be "GC_dlopen", which is implemented below. */ @@ -35,6 +36,7 @@ /* real system dlopen() in their implementation. We first remove */ /* gc.h's dlopen definition and restore it later, after GC_dlopen(). */ # undef dlopen +# define GC_MUST_RESTORE_REDEFINED_DLOPEN # endif GC_bool GC_collection_in_progress(void); @@ -64,22 +66,23 @@ #include <dlfcn.h> +/* This is similar to WRAP/REAL_FUNC() in pthread_support.c. */ #ifdef GC_USE_LD_WRAP -# define WRAP_FUNC(f) __wrap_##f -# define REAL_FUNC(f) __real_##f +# define WRAP_DLFUNC(f) __wrap_##f +# define REAL_DLFUNC(f) __real_##f #else -# define WRAP_FUNC(f) GC_##f -# define REAL_FUNC(f) f +# define WRAP_DLFUNC(f) GC_##f +# define REAL_DLFUNC(f) f #endif -GC_API void * WRAP_FUNC(dlopen)(const char *path, int mode) +GC_API void * WRAP_DLFUNC(dlopen)(const char *path, int mode) { void * result; # ifndef USE_PROC_FOR_LIBRARIES disable_gc_for_dlopen(); # endif - result = (void *)REAL_FUNC(dlopen)(path, mode); + result = (void *)REAL_DLFUNC(dlopen)(path, mode); # ifndef USE_PROC_FOR_LIBRARIES GC_enable(); /* undoes disable_gc_for_dlopen */ # endif @@ -96,4 +99,8 @@ GC_API void * WRAP_FUNC(dlopen)(const char *path, int mode) } #endif /* Linker-based interception. */ -# endif /* GC_PTHREADS || GC_SOLARIS_THREADS ... */ +# ifdef GC_MUST_RESTORE_REDEFINED_DLOPEN +# define dlopen GC_dlopen +# endif + +#endif /* GC_PTHREADS || GC_SOLARIS_THREADS ... */ |