diff options
| author | Sverker Eriksson <[email protected]> | 2016-05-09 15:30:04 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-05-09 15:30:04 +0200 |
| commit | 72854151006ca4bba903f99fb598fbe244827d5c (patch) | |
| tree | 4700fd2fa91ad01ae41ab62b191c5f9ed44944c2 /erts/emulator/beam/erl_hl_timer.c | |
| parent | 387e94f0a7796869486cf3160f2d124b1e216a21 (diff) | |
| parent | d38d8a4cafe04d7ad63a4d0b168a25eb5e887440 (diff) | |
| download | otp-72854151006ca4bba903f99fb598fbe244827d5c.tar.gz otp-72854151006ca4bba903f99fb598fbe244827d5c.tar.bz2 otp-72854151006ca4bba903f99fb598fbe244827d5c.zip | |
Merge branch 'sverker/trace-send-receive-matchspec/OTP-13507'
Diffstat (limited to 'erts/emulator/beam/erl_hl_timer.c')
| -rw-r--r-- | erts/emulator/beam/erl_hl_timer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_hl_timer.c b/erts/emulator/beam/erl_hl_timer.c index 8e201d5711..c418762578 100644 --- a/erts/emulator/beam/erl_hl_timer.c +++ b/erts/emulator/beam/erl_hl_timer.c @@ -1247,8 +1247,8 @@ hlt_bif_timer_timeout(ErtsHLTimer *tmr, Uint32 roflgs) if (!ERTS_PROC_IS_EXITING(proc)) { ErtsMessage *mp = erts_alloc_message(0, NULL); mp->data.heap_frag = tmr->btm.bp; - erts_queue_message(proc, &proc_locks, mp, - tmr->btm.message); + erts_queue_message(proc, proc_locks, mp, + tmr->btm.message, am_clock_service); erts_smp_proc_unlock(proc, ERTS_PROC_LOCKS_MSG_SEND); queued_message = 1; proc_locks &= ~ERTS_PROC_LOCKS_MSG_SEND; @@ -1980,7 +1980,7 @@ access_sched_local_btm(Process *c_p, Eterm pid, ERTS_HLT_ASSERT(hp + (async ? 4 : 3) == hp_end); - erts_queue_message(proc, &proc_locks, mp, msg); + erts_queue_message(proc, proc_locks, mp, msg, am_clock_service); if (c_p) proc_locks &= ~ERTS_PROC_LOCK_MAIN; @@ -2111,7 +2111,7 @@ try_access_sched_remote_btm(ErtsSchedulerData *esdp, msg = TUPLE3(hp, tag, tref, res); - erts_queue_message(c_p, &proc_locks, mp, msg); + erts_queue_message(c_p, proc_locks, mp, msg, am_clock_service); proc_locks &= ~ERTS_PROC_LOCK_MAIN; if (proc_locks) |