diff options
| author | Lukas Larsson <[email protected]> | 2013-09-30 14:16:05 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-09-30 14:16:05 +0200 |
| commit | c5459f9ba0e8b3568a34788bfd596f5f6be9fca2 (patch) | |
| tree | 89afe690217fb991bd26b4ae6fba5939d46adf86 /erts/doc/src/erlang.xml | |
| parent | 0f430abcb189988a7faf55386557b2b74afa6f56 (diff) | |
| parent | 0d18c06a55bcde2af8cff12fe49093fffd32466c (diff) | |
| download | otp-c5459f9ba0e8b3568a34788bfd596f5f6be9fca2.tar.gz otp-c5459f9ba0e8b3568a34788bfd596f5f6be9fca2.tar.bz2 otp-c5459f9ba0e8b3568a34788bfd596f5f6be9fca2.zip | |
Merge branch 'sv/system_info_max_ets' into maint
OTP-11362
* sv/system_info_max_ets:
Update preloaded
add system_info(ets_limit)
Diffstat (limited to 'erts/doc/src/erlang.xml')
| -rw-r--r-- | erts/doc/src/erlang.xml | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index 5ee40823bc..d3b21de8cf 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -5500,6 +5500,9 @@ ok <name name="system_info" arity="1" clause_i="49"/> <name name="system_info" arity="1" clause_i="50"/> <name name="system_info" arity="1" clause_i="51"/> + <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"/> <fsummary>Information about the system</fsummary> <desc> <p>Returns various information about the current system @@ -5576,6 +5579,13 @@ ok information see the <seealso marker="erts:crash_dump">"How to interpret the Erlang crash dumps"</seealso> chapter in the ERTS User's Guide.</p> </item> + <tag><marker id="system_info_dist_buf_busy_limit"><c>dist_buf_busy_limit</c></marker></tag> + <item> + <p>Returns the value of the distribution buffer busy limit + in bytes. This limit can be set on startup by passing the + <seealso marker="erts:erl#+zdbbl">+zdbbl</seealso> command line + flag to <c>erl</c>.</p> + </item> <tag><c>dist_ctrl</c></tag> <item> <p>Returns a list of tuples @@ -5622,12 +5632,14 @@ 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_dist_buf_busy_limit"><c>dist_buf_busy_limit</c></marker></tag> + <tag><c>ets_limit</c></tag> <item> - <p>Returns the value of the distribution buffer busy limit - in bytes. This limit can be set on startup by passing the - <seealso marker="erts:erl#+zdbbl">+zdbbl</seealso> command line - flag to <c>erl</c>.</p> + <p>Returns the maximum number of ETS tables allowed. This limit + can be increased on startup by passing the <seealso + marker="erts:erl#+e">+e</seealso> command line flag to + <c>erl</c> or by setting the environment variable + <c>ERL_MAX_ETS_TABLES</c> before starting the Erlang runtime + system.</p> </item> <tag><c>fullsweep_after</c></tag> <item> |