Changeset View
Changeset View
Standalone View
Standalone View
lib/libthr/thread/thr_clean.c
Show All 40 Lines | |||||
#include "un-namespace.h" | #include "un-namespace.h" | ||||
#include "thr_private.h" | #include "thr_private.h" | ||||
#undef pthread_cleanup_push | #undef pthread_cleanup_push | ||||
#undef pthread_cleanup_pop | #undef pthread_cleanup_pop | ||||
/* old binary compatible interfaces */ | /* old binary compatible interfaces */ | ||||
__weak_reference(_pthread_cleanup_push, pthread_cleanup_push); | __weak_reference(_thr_cleanup_pop, pthread_cleanup_pop); | ||||
__weak_reference(_pthread_cleanup_pop, pthread_cleanup_pop); | __weak_reference(_thr_cleanup_pop, _pthread_cleanup_pop); | ||||
__weak_reference(_thr_cleanup_push, pthread_cleanup_push); | |||||
__weak_reference(_thr_cleanup_push, _pthread_cleanup_push); | |||||
/* help static linking when libc symbols have preference */ | |||||
__weak_reference(__thr_cleanup_push_imp, __pthread_cleanup_push_imp); | |||||
__weak_reference(__thr_cleanup_pop_imp, __pthread_cleanup_pop_imp); | |||||
void | void | ||||
__pthread_cleanup_push_imp(void (*routine)(void *), void *arg, | __thr_cleanup_push_imp(void (*routine)(void *), void *arg, | ||||
struct _pthread_cleanup_info *info) | struct _pthread_cleanup_info *info) | ||||
arichardson: I think this should be `__weak_reference(__pthread_cleanup_pop_imp, __pthread_cleanup_pop_imp1)… | |||||
{ | { | ||||
struct pthread *curthread = _get_curthread(); | struct pthread *curthread = _get_curthread(); | ||||
struct pthread_cleanup *newbuf; | struct pthread_cleanup *newbuf; | ||||
newbuf = (void *)info; | newbuf = (void *)info; | ||||
newbuf->routine = routine; | newbuf->routine = routine; | ||||
newbuf->routine_arg = arg; | newbuf->routine_arg = arg; | ||||
newbuf->onheap = 0; | newbuf->onheap = 0; | ||||
newbuf->prev = curthread->cleanup; | newbuf->prev = curthread->cleanup; | ||||
curthread->cleanup = newbuf; | curthread->cleanup = newbuf; | ||||
} | } | ||||
void | void | ||||
__pthread_cleanup_pop_imp(int execute) | __thr_cleanup_pop_imp(int execute) | ||||
{ | { | ||||
struct pthread *curthread = _get_curthread(); | struct pthread *curthread = _get_curthread(); | ||||
struct pthread_cleanup *old; | struct pthread_cleanup *old; | ||||
if ((old = curthread->cleanup) != NULL) { | if ((old = curthread->cleanup) != NULL) { | ||||
curthread->cleanup = old->prev; | curthread->cleanup = old->prev; | ||||
if (execute) | if (execute) | ||||
old->routine(old->routine_arg); | old->routine(old->routine_arg); | ||||
if (old->onheap) | if (old->onheap) | ||||
free(old); | free(old); | ||||
} | } | ||||
} | } | ||||
void | void | ||||
_pthread_cleanup_push(void (*routine) (void *), void *arg) | _thr_cleanup_push(void (*routine)(void *), void *arg) | ||||
{ | { | ||||
struct pthread *curthread = _get_curthread(); | struct pthread *curthread = _get_curthread(); | ||||
struct pthread_cleanup *newbuf; | struct pthread_cleanup *newbuf; | ||||
#ifdef _PTHREAD_FORCED_UNWIND | #ifdef _PTHREAD_FORCED_UNWIND | ||||
curthread->unwind_disabled = 1; | curthread->unwind_disabled = 1; | ||||
#endif | #endif | ||||
if ((newbuf = (struct pthread_cleanup *) | if ((newbuf = (struct pthread_cleanup *) | ||||
malloc(sizeof(struct pthread_cleanup))) != NULL) { | malloc(sizeof(struct pthread_cleanup))) != NULL) { | ||||
newbuf->routine = routine; | newbuf->routine = routine; | ||||
newbuf->routine_arg = arg; | newbuf->routine_arg = arg; | ||||
newbuf->onheap = 1; | newbuf->onheap = 1; | ||||
newbuf->prev = curthread->cleanup; | newbuf->prev = curthread->cleanup; | ||||
curthread->cleanup = newbuf; | curthread->cleanup = newbuf; | ||||
} | } | ||||
} | } | ||||
void | void | ||||
_pthread_cleanup_pop(int execute) | _thr_cleanup_pop(int execute) | ||||
{ | { | ||||
__pthread_cleanup_pop_imp(execute); | __pthread_cleanup_pop_imp(execute); | ||||
} | } |
I think this should be __weak_reference(__pthread_cleanup_pop_imp, __pthread_cleanup_pop_imp1);
I get the following build error with the current patch: