diff options
| author | Sverker Eriksson <[email protected]> | 2019-05-06 16:51:36 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-05-06 16:51:36 +0200 |
| commit | 8918de63a3d7ee8e1945a5c57331dddf1ee91fc2 (patch) | |
| tree | d89e85fe736e7ff3c5ad939e83086195e4075b81 | |
| parent | 8ad504d6013adccd85d488d64b9c5f7134e3ecd5 (diff) | |
| parent | e07875f133d9723610e4e26e1dd9d94adc645a1a (diff) | |
| download | otp-8918de63a3d7ee8e1945a5c57331dddf1ee91fc2.tar.gz otp-8918de63a3d7ee8e1945a5c57331dddf1ee91fc2.tar.bz2 otp-8918de63a3d7ee8e1945a5c57331dddf1ee91fc2.zip | |
Merge branch 'maint'
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 8e93e53003..bae64afb97 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -3272,7 +3272,7 @@ erts_current_reductions(Process *c_p, Process *p) } else { reds_left = c_p->fcalls; } - return REDS_IN(c_p) - reds_left; + return REDS_IN(c_p) - reds_left - erts_proc_sched_data(p)->virtual_reds; } int diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 0339589b79..2704b99aa4 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -768,7 +768,7 @@ static ErtsProcessInfoArgs pi_args[] = { {am_memory, 0, ERTS_PI_FLAG_NEED_MSGQ_LEN|ERTS_PI_FLAG_FORCE_SIG_SEND, ERTS_PROC_LOCK_MAIN}, {am_garbage_collection, 3+2 + 3+2 + 3+2 + 3+2 + 3+2 + ERTS_MAX_HEAP_SIZE_MAP_SZ, 0, ERTS_PROC_LOCK_MAIN}, {am_group_leader, 0, 0, ERTS_PROC_LOCK_MAIN}, - {am_reductions, 0, 0, ERTS_PROC_LOCK_MAIN}, + {am_reductions, 0, ERTS_PI_FLAG_FORCE_SIG_SEND, ERTS_PROC_LOCK_MAIN}, {am_priority, 0, 0, 0}, {am_trace, 0, 0, ERTS_PROC_LOCK_MAIN}, {am_binary, 0, ERTS_PI_FLAG_FORCE_SIG_SEND, ERTS_PROC_LOCK_MAIN}, |