diff options
author | Rickard Green <[email protected]> | 2014-09-25 17:05:48 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2014-09-25 17:05:48 +0200 |
commit | 3e4491cf98d6ec0ff8b10dfdfac8d8c0b7031e61 (patch) | |
tree | 1bee4fc91742e3291792caacc61d20a67a80300d /erts/doc/src/erlang.xml | |
parent | 743ed31108ee555db18d9833186865e85e34333e (diff) | |
parent | 6084a42a24fca52a5de2bc487c0cd2be46dcc21f (diff) | |
download | otp-3e4491cf98d6ec0ff8b10dfdfac8d8c0b7031e61.tar.gz otp-3e4491cf98d6ec0ff8b10dfdfac8d8c0b7031e61.tar.bz2 otp-3e4491cf98d6ec0ff8b10dfdfac8d8c0b7031e61.zip |
Merge branch 'rickard/eager-check-io/OTP-12117' into rickard/maint-17/eager-check-io/OTP-12117
* rickard/eager-check-io/OTP-12117:
Introduce support for eager check I/O scheduling
Conflicts:
erts/emulator/beam/erl_bif_info.c
erts/emulator/beam/erl_init.c
erts/emulator/beam/erl_process.c
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/doc/src/erlang.xml')
-rw-r--r-- | erts/doc/src/erlang.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index 84168397f6..111756407f 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -5775,6 +5775,7 @@ ok <name name="system_info" arity="1" clause_i="52"/> <name name="system_info" arity="1" clause_i="53"/> <name name="system_info" arity="1" clause_i="54"/> + <name name="system_info" arity="1" clause_i="55"/> <fsummary>Information about the system</fsummary> <desc> <p>Returns various information about the current system @@ -5970,6 +5971,16 @@ ok The return value will always be <c>false</c> since the elib_malloc allocator has been removed.</p> </item> + <tag><marker id="system_info_eager_check_io"><c>eager_check_io</c></marker></tag> + <item> + <p> + Returns the value of the <c>erl</c> + <seealso marker="erl#+secio">+secio</seealso> command line + flag which is either <c>true</c> or <c>false</c>. See the + documentation of the command line flag for information about + the different values. + </p> + </item> <tag><c>ets_limit</c></tag> <item> <p>Returns the maximum number of ETS tables allowed. This limit |