From 75a79e6547fd66c2194d6f488c30ad888a715f4b Mon Sep 17 00:00:00 2001
From: Steve Vinoski <vinoski@ieee.org>
Date: Wed, 4 Sep 2013 10:21:47 -0400
Subject: add system_info(ets_limit)

Add system_info(ets_limit) to provide a way to retrieve the runtime's
maximum number of ETS tables. Add tests and documentation for it too.

Also repair the alphabetical order of system_info/1 argument descriptions
in the documentation and in the erlang.erl clauses. Add new preloaded
erlang.erl due to that change. Also ensure all system_info/1 clauses are
represented in the erlang.xml source documentation -- a couple had been
inadvertently dropped in previous commits when other clauses were added.
---
 erts/doc/src/erl.xml    |  2 +-
 erts/doc/src/erlang.xml | 22 +++++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'erts/doc')

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index c16b45856d..528a2d95aa 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -524,7 +524,7 @@
 	<p>Calling <c>erlang:halt/1</c> with a string argument will still
 	produce a crash dump.</p>
       </item>
-      <tag><c><![CDATA[+e Number]]></c></tag>
+      <tag><marker id="+e"><c><![CDATA[+e Number]]></c></marker></tag>
       <item>
         <p>Set max number of ETS tables.</p>
       </item>
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>
-- 
cgit v1.2.3