diff options
| author | Rickard Green <[email protected]> | 2017-01-11 16:15:06 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-01-11 16:15:06 +0100 |
| commit | 14b51371e2feaa748525c04682d26c9741a2ab7a (patch) | |
| tree | 772370fd7d824d198b82c4bb1723bbc9764db2d4 /erts/emulator | |
| parent | a20bf8fbeb58a20bc7482bb05276eed4604afe3e (diff) | |
| parent | f704fcf7a4524ad8dba04484224e486999db0a3d (diff) | |
| download | otp-14b51371e2feaa748525c04682d26c9741a2ab7a.tar.gz otp-14b51371e2feaa748525c04682d26c9741a2ab7a.tar.bz2 otp-14b51371e2feaa748525c04682d26c9741a2ab7a.zip | |
Merge branch 'maint'
* maint:
Fix printout of timer data in crash dump
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/erl_hl_timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_hl_timer.c b/erts/emulator/beam/erl_hl_timer.c index 38bebc7576..647fa26811 100644 --- a/erts/emulator/beam/erl_hl_timer.c +++ b/erts/emulator/beam/erl_hl_timer.c @@ -2865,7 +2865,8 @@ btm_print(ErtsHLTimer *tmr, void *vbtmp) if (tmr->timeout <= btmp->now) left = 0; - left = ERTS_CLKTCKS_TO_MSEC(tmr->timeout - btmp->now); + else + left = ERTS_CLKTCKS_TO_MSEC(tmr->timeout - btmp->now); receiver = ((tmr->head.roflgs & ERTS_TMR_ROFLG_REG_NAME) ? tmr->receiver.name |