diff options
author | Lukas Larsson <[email protected]> | 2016-05-11 09:22:53 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2016-05-11 09:22:53 +0200 |
commit | 76378f21242b8036bac1b187e895bcafa28201da (patch) | |
tree | 7b4f7927292cb193854b3012573d17e371e4ed6a /lib/stdlib/doc/src/proc_lib.xml | |
parent | 8bc9c88cd98bbbcc18265a7aed830b73f5133cf6 (diff) | |
parent | 36dd5c3dd86c91d04a7fc13fd2a89b10af64db5a (diff) | |
download | otp-76378f21242b8036bac1b187e895bcafa28201da.tar.gz otp-76378f21242b8036bac1b187e895bcafa28201da.tar.bz2 otp-76378f21242b8036bac1b187e895bcafa28201da.zip |
Merge branch 'lukas/erts/max_heap_size/OTP-13174'
* lukas/erts/max_heap_size/OTP-13174:
erts: Fix max heap size exit when in hipe mode
Update preloaded modules
erts: Fix pre-bif yield current_function
erts: Implement max_heap_size process flag
Diffstat (limited to 'lib/stdlib/doc/src/proc_lib.xml')
-rw-r--r-- | lib/stdlib/doc/src/proc_lib.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml index 245580b1ba..f02b1f0651 100644 --- a/lib/stdlib/doc/src/proc_lib.xml +++ b/lib/stdlib/doc/src/proc_lib.xml @@ -73,6 +73,13 @@ <name name="priority_level"/> </datatype> <datatype> + <name name="max_heap_size"/> + <desc> + <p>See <seealso marker="erts:erlang#process_flag_max_heap_size"> + erlang:process_flag(max_heap_size, MaxHeapSize)</seealso>.</p> + </desc> + </datatype> + <datatype> <name name="dict_or_pid"/> </datatype> </datatypes> |