diff options
| author | David Xu <davidxu@FreeBSD.org> | 2010-09-01 07:09:46 +0000 |
|---|---|---|
| committer | David Xu <davidxu@FreeBSD.org> | 2010-09-01 07:09:46 +0000 |
| commit | 12c61c22cee3fc4205ab945e038c9f1d6d0b0027 (patch) | |
| tree | dfbeee15a5a85f759457c54a057c371bd4c76be9 /lib | |
| parent | 901c71c7044d47f4ac6cc656e5d35aae7c8f2760 (diff) | |
| download | src-12c61c22cee3fc4205ab945e038c9f1d6d0b0027.tar.gz src-12c61c22cee3fc4205ab945e038c9f1d6d0b0027.zip | |
In function __pthread_cxa_finalize(), also make code for removing
atfork handler be async-signal safe.
Notes
Notes:
svn path=/head/; revision=212083
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libthr/thread/thr_fork.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/libthr/thread/thr_fork.c b/lib/libthr/thread/thr_fork.c index c70096ea6421..c15e8f9a32a5 100644 --- a/lib/libthr/thread/thr_fork.c +++ b/lib/libthr/thread/thr_fork.c @@ -100,22 +100,29 @@ _pthread_atfork(void (*prepare)(void), void (*parent)(void), void __pthread_cxa_finalize(struct dl_phdr_info *phdr_info) { + atfork_head temp_list = TAILQ_HEAD_INITIALIZER(temp_list); struct pthread *curthread; struct pthread_atfork *af, *af1; _thr_check_init(); curthread = _get_curthread(); + THR_CRITICAL_ENTER(curthread); _thr_rwl_wrlock(&_thr_atfork_lock); TAILQ_FOREACH_SAFE(af, &_thr_atfork_list, qe, af1) { if (__elf_phdr_match_addr(phdr_info, af->prepare) || __elf_phdr_match_addr(phdr_info, af->parent) || __elf_phdr_match_addr(phdr_info, af->child)) { TAILQ_REMOVE(&_thr_atfork_list, af, qe); - free(af); + TAILQ_INSERT_TAIL(&temp_list, af, qe); } } _thr_rwl_unlock(&_thr_atfork_lock); + THR_CRITICAL_LEAVE(curthread); + while ((af = TAILQ_FIRST(&temp_list)) != NULL) { + TAILQ_REMOVE(&temp_list, af, qe); + free(af); + } _thr_tsd_unload(phdr_info); _thr_sigact_unload(phdr_info); } |