diff options
| author | Rickard Green <[email protected]> | 2016-01-22 11:11:06 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-01-22 11:11:06 +0100 |
| commit | 3d99247859e1d5d1862b550cd29c44a4f4cf54e0 (patch) | |
| tree | cef0b01d8cb82f5ebbbf5d206f1d8ad0feded238 /erts/emulator/beam | |
| parent | 59d6e191aea477fdbbf2befa47ae1f612ed6ab17 (diff) | |
| parent | 9293a250e02e63d295a841786f03c3e3a3f30e97 (diff) | |
| download | otp-3d99247859e1d5d1862b550cd29c44a4f4cf54e0.tar.gz otp-3d99247859e1d5d1862b550cd29c44a4f4cf54e0.tar.bz2 otp-3d99247859e1d5d1862b550cd29c44a4f4cf54e0.zip | |
Merge branch 'rickard/test-fix' into maint
* rickard/test-fix:
Fix HL timer hard debug implementation
Fix stack alignment problem in ethread test on arm
Skip time_SUITE:timestamp on timewarp test
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_hl_timer.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_hl_timer.c b/erts/emulator/beam/erl_hl_timer.c index 51a0d68247..fb6d249145 100644 --- a/erts/emulator/beam/erl_hl_timer.c +++ b/erts/emulator/beam/erl_hl_timer.c @@ -1055,6 +1055,8 @@ create_hl_timer(ErtsSchedulerData *esdp, erts_aint32_t refc; Uint32 roflgs; + ERTS_HLT_HDBG_CHK_SRV(srv); + check_canceled_queue(esdp, srv); ERTS_HLT_ASSERT((esdp->no & ~ERTS_TMR_ROFLG_SID_MASK) == 0); @@ -1179,8 +1181,6 @@ create_hl_timer(ErtsSchedulerData *esdp, erts_smp_atomic32_init_nob(&tmr->head.refc, refc); erts_smp_atomic32_init_nob(&tmr->state, ERTS_TMR_STATE_ACTIVE); - ERTS_HLT_HDBG_CHK_SRV(srv); - if (!srv->next_timeout || tmr->timeout < srv->next_timeout->timeout) { if (srv->next_timeout) @@ -3099,7 +3099,8 @@ tt_hdbg_func(ErtsHLTimer *tmr, void *vhdbg) & ~ERTS_HLT_PFLGS_MASK); ERTS_HLT_ASSERT(tmr == prnt); } - ERTS_HLT_ASSERT(btm_rbt_lookup(hdbg->srv->btm_tree, tmr->btm.refn) == tmr); + if (tmr->head.roflgs & ERTS_TMR_ROFLG_BIF_TMR) + ERTS_HLT_ASSERT(btm_rbt_lookup(hdbg->srv->btm_tree, tmr->btm.refn) == tmr); if (tmr->time.tree.same_time) { ErtsHdbgHLT st_hdbg; st_hdbg.srv = hdbg->srv; |