Loading...
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 | --- atexit.c.bsdnew 2009-11-13 14:11:47.000000000 -0800 +++ atexit.c 2009-11-13 14:11:47.000000000 -0800 @@ -41,14 +41,23 @@ __FBSDID("$FreeBSD: src/lib/libc/stdlib/ #include <stdlib.h> #include <unistd.h> #include <pthread.h> +#if defined(__DYNAMIC__) || defined (__BLOCKS__) +#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; @@ -63,6 +72,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 */ @@ -70,6 +82,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 @@ -105,6 +118,7 @@ atexit_register(struct atexit_fn *fptr) __atexit = p; } p->fns[p->ind++] = *fptr; + new_registration = 1; _MUTEX_UNLOCK(&atexit_mutex); return 0; } @@ -116,17 +130,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. @@ -152,13 +199,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) @@ -171,6 +219,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. */ @@ -178,7 +227,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); |