diff options
| author | Erlang/OTP <[email protected]> | 2019-05-06 17:09:13 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-05-06 17:09:13 +0200 |
| commit | f887b77313b2e8f36b2030dddea1eda78199d407 (patch) | |
| tree | 80f66538c267625fd45e45a57036f61e49fa179e /erts | |
| parent | f62aeddff8fbd9653a54360b1c99d9d50705b359 (diff) | |
| parent | 70dbf671a8196110d2aee2e7507afc2c2c75183f (diff) | |
| download | otp-f887b77313b2e8f36b2030dddea1eda78199d407.tar.gz otp-f887b77313b2e8f36b2030dddea1eda78199d407.tar.bz2 otp-f887b77313b2e8f36b2030dddea1eda78199d407.zip | |
Merge branch 'sverker/process_info-reductions-fix/OTP-15793' into maint-21
* sverker/process_info-reductions-fix/OTP-15793:
erts: Force process_info(reductions) as signal
erts: Fix another bug in process_info(reductions)
Diffstat (limited to 'erts')
| -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 10d70a96e8..3af0838794 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -3277,7 +3277,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 16c06766fb..96f399fbbe 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -761,7 +761,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}, |