diff options
| author | Lukas Larsson <[email protected]> | 2016-01-26 10:18:05 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-01-26 10:21:01 +0100 |
| commit | 82dfea33002de4ad456b59d11d912c148e2debfb (patch) | |
| tree | 7c51f8413827d28b0520ce3e20abba94ee6226b6 /erts/preloaded/src/erlang.erl | |
| parent | d60ac245114e7e7d82bd21ca047f5bdf6016708b (diff) | |
| parent | 9d0a5bf2c1cc564fd38268cbb5313cd8813ea138 (diff) | |
| download | otp-82dfea33002de4ad456b59d11d912c148e2debfb.tar.gz otp-82dfea33002de4ad456b59d11d912c148e2debfb.tar.bz2 otp-82dfea33002de4ad456b59d11d912c148e2debfb.zip | |
Merge branch 'lukas/erts/gc_info/OTP-13265'
* lukas/erts/gc_info/OTP-13265:
erts: Add garbage_collection_info to process_info/2
Conflicts:
erts/emulator/beam/erl_bif_info.c
Diffstat (limited to 'erts/preloaded/src/erlang.erl')
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 40d5aedd24..a9b1714f86 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -2051,6 +2051,7 @@ process_flag(_Flag, _Value) -> dictionary | error_handler | garbage_collection | + garbage_collection_info | group_leader | heap_size | initial_call | @@ -2091,6 +2092,7 @@ process_flag(_Flag, _Value) -> {dictionary, Dictionary :: [{Key :: term(), Value :: term()}]} | {error_handler, Module :: module()} | {garbage_collection, GCInfo :: [{atom(),non_neg_integer()}]} | + {garbage_collection_info, GCInfo :: [{atom(),non_neg_integer()}]} | {group_leader, GroupLeader :: pid()} | {heap_size, Size :: non_neg_integer()} | {initial_call, mfa()} | |