--- atexit.c.orig 2009-05-12 11:21:33.000000000 -0700 +++ atexit.c 2009-05-23 13:46:33.000000000 -0700 @@ -45,14 +45,23 @@ __FBSDID("$FreeBSD: src/lib/libc/stdlib/ #include <stdlib.h> #include <unistd.h> #include <pthread.h> +#if defined(__DYNAMIC__) +#include <dlfcn.h> +#endif /* defined(__DYNAMIC__) */ #include "atexit.h" #include "un-namespace.h" +#ifdef __BLOCKS__ +#include <Block.h> +#endif /* __BLOCKS__ */ #include "libc_private.h" #define ATEXIT_FN_EMPTY 0 #define ATEXIT_FN_STD 1 #define ATEXIT_FN_CXA 2 +#ifdef __BLOCKS__ +#define ATEXIT_FN_BLK 3 +#endif /* __BLOCKS__ */ static pthread_mutex_t atexit_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -67,6 +76,9 @@ struct atexit { union { void (*std_func)(void); void (*cxa_func)(void *); +#ifdef __BLOCKS__ + void (^block)(void); +#endif /* __BLOCKS__ */ } fn_ptr; /* function pointer */ void *fn_arg; /* argument for CXA callback */ void *fn_dso; /* shared module handle */ @@ -74,6 +86,7 @@ struct atexit { }; static struct atexit *__atexit; /* points to head of LIFO stack */ +static int new_registration; /* * Register the function described by 'fptr' to be called at application @@ -109,6 +122,7 @@ atexit_register(struct atexit_fn *fptr) __atexit = p; } p->fns[p->ind++] = *fptr; + new_registration = 1; _MUTEX_UNLOCK(&atexit_mutex); return 0; } @@ -120,17 +134,50 @@ int atexit(void (*func)(void)) { struct atexit_fn fn; + struct dl_info info; int error; fn.fn_type = ATEXIT_FN_STD; - fn.fn_ptr.std_func = func;; + fn.fn_ptr.std_func = func; fn.fn_arg = NULL; +#if defined(__DYNAMIC__) + if ( dladdr(func, &info) ) + fn.fn_dso = info.dli_fbase; + else + fn.fn_dso = NULL; +#else /* ! defined(__DYNAMIC__) */ fn.fn_dso = NULL; +#endif /* defined(__DYNAMIC__) */ error = atexit_register(&fn); return (error); } +#ifdef __BLOCKS__ +int +atexit_b(void (^block)(void)) +{ + struct atexit_fn fn; + struct dl_info info; + int error; + + fn.fn_type = ATEXIT_FN_BLK; + fn.fn_ptr.block = Block_copy(block); + fn.fn_arg = NULL; +#if defined(__DYNAMIC__) + if ( dladdr(block, &info) ) + fn.fn_dso = info.dli_fbase; + else + fn.fn_dso = NULL; +#else /* ! defined(__DYNAMIC__) */ + fn.fn_dso = NULL; +#endif /* defined(__DYNAMIC__) */ + + error = atexit_register(&fn); + return (error); +} +#endif /* __BLOCKS__ */ + /* * Register a function to be performed at exit or when an shared object * with given dso handle is unloaded dynamically. @@ -156,13 +203,14 @@ __cxa_atexit(void (*func)(void *), void * handlers are called. */ void -__cxa_finalize(void *dso) +__cxa_finalize(const void *dso) { struct atexit *p; struct atexit_fn fn; int n; _MUTEX_LOCK(&atexit_mutex); +restart: for (p = __atexit; p; p = p->next) { for (n = p->ind; --n >= 0;) { if (p->fns[n].fn_type == ATEXIT_FN_EMPTY) @@ -175,6 +223,7 @@ __cxa_finalize(void *dso) has already been called. */ p->fns[n].fn_type = ATEXIT_FN_EMPTY; + new_registration = 0; _MUTEX_UNLOCK(&atexit_mutex); /* Call the function of correct type. */ @@ -182,7 +231,13 @@ __cxa_finalize(void *dso) fn.fn_ptr.cxa_func(fn.fn_arg); else if (fn.fn_type == ATEXIT_FN_STD) fn.fn_ptr.std_func(); +#ifdef __BLOCKS__ + else if (fn.fn_type == ATEXIT_FN_BLK) + fn.fn_ptr.block(); +#endif /* __BLOCKS__ */ _MUTEX_LOCK(&atexit_mutex); + if (new_registration) + goto restart; } } _MUTEX_UNLOCK(&atexit_mutex);