diff options
author | Erlang/OTP <[email protected]> | 2019-06-12 09:51:21 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2019-06-12 09:51:21 +0200 |
commit | 28e30d0e5c3bfb97c739092996fa21308b3befd6 (patch) | |
tree | e22af636de24ecaab4caf3909b75e4006a8dd9e3 /erts/emulator/beam | |
parent | 089ce1ca4be5ef12b86d7c806e30a31031d1ea6e (diff) | |
parent | 9807d727adf8895e16fa1463bcdf7a38a0d1878f (diff) | |
download | otp-28e30d0e5c3bfb97c739092996fa21308b3befd6.tar.gz otp-28e30d0e5c3bfb97c739092996fa21308b3befd6.tar.bz2 otp-28e30d0e5c3bfb97c739092996fa21308b3befd6.zip |
Merge branch 'sverker/erts/process-info-reductions-idle-proc/ERL-964/OTP-15865' into maint-22
* sverker/erts/process-info-reductions-idle-proc/ERL-964/OTP-15865:
erts: Improve test of process_info(reductions)
Revert "erts: Force process_info(reductions) as signal"
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 2704b99aa4..0339589b79 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, ERTS_PI_FLAG_FORCE_SIG_SEND, ERTS_PROC_LOCK_MAIN}, + {am_reductions, 0, 0, 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}, |