diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2008-05-06 09:27:41 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2008-05-06 09:27:41 +0000 |
| commit | e91ff25c0c0b2bd0d7d8bd5b1c96457bf2bef352 (patch) | |
| tree | 0d4b4b84b2ad5fa15e5d4e4caee3794dae371904 /libexec/rtld-elf/rtld_lock.c | |
| parent | cf181aee600f9c7e459ef27860be83ef40ae3970 (diff) | |
Fix the problem with the C++ exception handling for the multithreaded
programs.
From the PR description:
The gcc runtime's _Unwind_Find_FDE function, invoked during exception
handling's stack unwinding, is not safe to execute from within multiple
threads. FreeBSD' s dl_iterate_phdr() however permits multiple threads
to pass through it though. The result is surprisingly reliable infinite
looping of one or more threads if they just happen to be unwinding at
the same time.
Introduce the new lock that is write locked around the dl_iterate_pdr,
thus providing required exclusion for the stack unwinders.
PR: threads/123062
Submitted by: Andy Newman <an at atrn org>
Reviewed by: kan
MFC after: 2 weeks
Notes
svn path=/head/; revision=178807
Diffstat (limited to 'libexec/rtld-elf/rtld_lock.c')
| -rw-r--r-- | libexec/rtld-elf/rtld_lock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libexec/rtld-elf/rtld_lock.c b/libexec/rtld-elf/rtld_lock.c index 1d77fe105591..c67f5fb0d545 100644 --- a/libexec/rtld-elf/rtld_lock.c +++ b/libexec/rtld-elf/rtld_lock.c @@ -171,7 +171,7 @@ thread_mask_clear(int mask) lockinfo.thread_clr_flag(mask); } -#define RTLD_LOCK_CNT 2 +#define RTLD_LOCK_CNT 3 struct rtld_lock { void *handle; int mask; @@ -179,6 +179,7 @@ struct rtld_lock { rtld_lock_t rtld_bind_lock = &rtld_locks[0]; rtld_lock_t rtld_libc_lock = &rtld_locks[1]; +rtld_lock_t rtld_phdr_lock = &rtld_locks[2]; int rlock_acquire(rtld_lock_t lock) |