mirror of
https://github.com/tobast/libunwind-eh_elf.git
synced 2024-11-08 02:18:11 +01:00
(unw): Initialize "lock" member. Switch to ANSI99-style initializers.
(ia64_init): Use unw.lock to protect against races during initialization. Disable signal delivery during initialization to ensure thread-safety (e.g., unw_init_local() may call ia64_init() and the former must be thread-safe). (Logical change 1.111)
This commit is contained in:
parent
3cc1ec6be9
commit
8e71bb0ab2
1 changed files with 54 additions and 39 deletions
|
@ -27,14 +27,15 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
|||
|
||||
struct ia64_global_unwind_state unw =
|
||||
{
|
||||
needs_initialization: 1,
|
||||
save_order: {
|
||||
.needs_initialization = 1,
|
||||
.lock = PTHREAD_MUTEX_INITIALIZER,
|
||||
.save_order = {
|
||||
IA64_REG_IP, IA64_REG_PFS, IA64_REG_PSP, IA64_REG_PR,
|
||||
IA64_REG_UNAT, IA64_REG_LC, IA64_REG_FPSR, IA64_REG_PRI_UNAT_GR
|
||||
},
|
||||
#if UNW_DEBUG
|
||||
debug_level: 0,
|
||||
preg_name: {
|
||||
.debug_level = 0,
|
||||
.preg_name = {
|
||||
"pri_unat_gr", "pri_unat_mem", "psp", "bsp", "bspstore",
|
||||
"ar.pfs", "ar.rnat", "rp",
|
||||
"r4", "r5", "r6", "r7",
|
||||
|
@ -73,9 +74,19 @@ ia64_init (void)
|
|||
0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xfe,
|
||||
0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
sigset_t saved_sigmask;
|
||||
uint8_t *lep, *bep;
|
||||
long i;
|
||||
|
||||
sigprocmask (SIG_SETMASK, &unwi_full_sigmask, &saved_sigmask);
|
||||
mutex_lock (&unw.lock);
|
||||
{
|
||||
if (!unw.needs_initialization)
|
||||
/* another thread else beat us to it... */
|
||||
goto out;
|
||||
|
||||
unw.needs_initialization = 0;
|
||||
|
||||
mi_init ();
|
||||
|
||||
mempool_init (&unw.reg_state_pool, sizeof (struct ia64_reg_state), 0);
|
||||
|
@ -123,3 +134,7 @@ ia64_init (void)
|
|||
# endif
|
||||
#endif
|
||||
}
|
||||
out:
|
||||
mutex_unlock (&unw.lock);
|
||||
sigprocmask (SIG_SETMASK, &saved_sigmask, NULL);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue