Merge branch 'master' into sverker/hipe-fun-purge

7 files changed, 124 insertions, 74 deletions

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index f62d3fb170..eb1d24cf12 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -393,9 +393,11 @@
       <tag><c><![CDATA[-pa Dir1 Dir2 ...]]></c></tag>
       <item>
         <p>Adds the specified directories to the beginning of the code
-          path, similar to <c><![CDATA[code:add_pathsa/1]]></c>; see
-          <seealso marker="kernel:code"><c>code(3)</c></seealso>.
-	  As an alternative to <c>-pa</c>, if several directories are
+          path, similar to <seealso marker="kernel:code#add_pathsa/1">
+	  <c><![CDATA[code:add_pathsa/1]]></c></seealso>. Note that the
+	  order of the given directories will be reversed in the
+	  resulting path.</p>
+	<p>As an alternative to <c>-pa</c>, if several directories are
 	  to be prepended to the code path and the directories have a
 	  common parent directory, that parent directory can be
 	  specified in environment variable <c>ERL_LIBS</c>; see
diff --git a/erts/doc/src/erl_driver.xml b/erts/doc/src/erl_driver.xml
index 836a58a676..5191742bc9 100644
--- a/erts/doc/src/erl_driver.xml
+++ b/erts/doc/src/erl_driver.xml
@@ -1916,9 +1916,9 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
           returned. Another thread can still be using the event object
           internally. To safely close an event object, call
           <c>driver_select</c> with <c>ERL_DRV_USE</c> and <c>on==0</c>, which
-          clears all events. Then call
-          <seealso marker="driver_entry#stop_select">
-          <c>stop_select</c></seealso> when it is safe to close the event
+          clears all events and then either calls
+	  <seealso marker="driver_entry#stop_select"><c>stop_select</c></seealso>
+	  or schedules it to be called when it is safe to close the event
           object. <c>ERL_DRV_USE</c> is to be set together with the first event
           for an event object. It is harmless to set <c>ERL_DRV_USE</c>
           even if it already has been done. Clearing all events but keeping
diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml
index b5dc9037c4..906c1be17b 100644
--- a/erts/doc/src/erl_nif.xml
+++ b/erts/doc/src/erl_nif.xml
@@ -80,7 +80,7 @@
 
     <code type="none">
 /* niftest.c */
-#include "erl_nif.h"
+#include &lt;erl_nif.h&gt;
 
 static ERL_NIF_TERM hello(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
@@ -296,8 +296,8 @@ return term;</code>
           synchronization. This includes terms in process-independent
           environments that are shared between threads. Resource objects also
           require synchronization if you treat them as mutable.</p>
-        <p>The library initialization callbacks <c>load</c>, <c>reload</c>, and
-          <c>upgrade</c> are all thread-safe even for shared state data.</p>
+        <p>The library initialization callbacks <c>load</c> and
+          <c>upgrade</c> are thread-safe even for shared state data.</p>
       </item>
       <tag><marker id="version_management"/>Version Management</tag>
       <item>
@@ -498,7 +498,7 @@ return term;</code>
     <title>Initialization</title>
     <taglist>
       <tag><marker id="ERL_NIF_INIT"/><c>ERL_NIF_INIT(MODULE,
-        ErlNifFunc funcs[], load, reload, upgrade, unload)</c></tag>
+        ErlNifFunc funcs[], load, NULL, upgrade, unload)</c></tag>
       <item>
         <p>This is the magic macro to initialize a NIF library. It
           is to be evaluated in global file scope.</p>
@@ -507,11 +507,14 @@ return term;</code>
           the macro.</p>
         <p><c>funcs</c> is a static array of function descriptors for
           all the implemented NIFs in this library.</p>
-        <p><c>load</c>, <c>reload</c>, <c>upgrade</c> and <c>unload</c>
-          are pointers to functions. One of <c>load</c>, <c>reload</c>, or
+        <p><c>load</c>, <c>upgrade</c> and <c>unload</c>
+          are pointers to functions. One of <c>load</c> or
           <c>upgrade</c> is called to initialize the library.
           <c>unload</c> is called to release the library. All are
           described individually below.</p>
+       <p>The fourth argument <c>NULL</c> is ignored. It
+          was earlier used for the deprectated <c>reload</c> callback
+          which is no longer supported since OTP 20.</p>
         <p>If compiling a NIF for static inclusion through
           <c>--enable-static-nifs</c>, you must define <c>STATIC_ERLANG_NIF</c>
            before the <c>ERL_NIF_INIT</c> declaration.</p>
@@ -539,7 +542,7 @@ return term;</code>
           and there is old code of this module with a loaded NIF library.</p>
         <p>Works as <c>load</c>, except that <c>*old_priv_data</c> already
           contains the value set by the last call to <c>load</c> or
-          <c>reload</c> for the old module code. <c>*priv_data</c> is
+          <c>upgrade</c> for the old module code. <c>*priv_data</c> is
           initialized to <c>NULL</c> when <c>upgrade</c> is called. It is
           allowed to write to both <c>*priv_data</c> and
           <c>*old_priv_data.</c></p> 
@@ -551,27 +554,7 @@ return term;</code>
       <item>
         <p><c>unload</c> is called when the module code that
           the NIF library belongs to is purged as old. New code of the same
-          module may or may not exist. Notice that <c>unload</c> is not
-          called for a replaced library as a consequence of <c>reload</c>.</p>
-      </item>
-      <tag><marker id="reload"/><c>int (*reload)(ErlNifEnv* env, void**
-        priv_data, ERL_NIF_TERM load_info)</c></tag>
-      <item>
-        <note>
-          <p><em>The reload mechanism is deprecated.</em> It was only intended
-            as a development feature. Do not use it as an upgrade method for
-            live production systems. It can be removed in future releases.
-            Ensure to pass <c>reload</c> as <c>NULL</c> to
-            <seealso marker="#ERL_NIF_INIT"><c>ERL_NIF_INIT</c></seealso>
-            to disable it when not used.</p>
-        </note>
-        <p><c>reload</c> is called when the NIF library is loaded and a
-          previously loaded library already exists for this module code.</p>
-        <p>Works as <c>load</c>, except that
-          <c>*priv_data</c> already contains the value set by the
-          previous call to <c>load</c> or <c>reload</c>.</p>
-        <p>The library fails to load if <c>reload</c> returns
-          anything other than <c>0</c> or if <c>reload</c> is <c>NULL</c>.</p> 
+          module may or may not exist.</p>
       </item>
     </taglist>
   </section>
@@ -2249,9 +2232,8 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
           returns <c>NULL</c> and sets <c>*tried</c> to <c>flags</c>.
           It is allowed to set <c>tried</c> to <c>NULL</c>.</p>
         <p>Notice that <c>enif_open_resource_type</c> is only allowed to be
-          called in the three callbacks
-          <seealso marker="#load"><c>load</c></seealso>,
-          <seealso marker="#reload"><c>reload</c></seealso>, and
+          called in the two callbacks
+          <seealso marker="#load"><c>load</c></seealso> and
           <seealso marker="#upgrade"><c>upgrade</c></seealso>.</p>
       </desc>
     </func>
@@ -2305,10 +2287,8 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
       <fsummary>Get the private data of a NIF library.</fsummary>
       <desc>
         <p>Returns the pointer to the private data that was set by
-          <seealso marker="#load"><c>load</c></seealso>,
-          <seealso marker="#reload"><c>reload</c></seealso>, or
+          <seealso marker="#load"><c>load</c></seealso> or
           <seealso marker="#upgrade"><c>upgrade</c></seealso>.</p>
-        <p>Was previously named <c>enif_get_data</c>.</p>
       </desc>
     </func>
 
diff --git a/erts/doc/src/erl_tracer.xml b/erts/doc/src/erl_tracer.xml
index 83eef374ca..43613c31b1 100644
--- a/erts/doc/src/erl_tracer.xml
+++ b/erts/doc/src/erl_tracer.xml
@@ -684,7 +684,7 @@ trace(_, _, _, _, _) ->
     <p><c>erl_msg_tracer.c</c>:</p>
 
     <pre>
-#include "erl_nif.h"
+#include &lt;erl_nif.h&gt;
 
 /* NIF interface declarations */
 static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info);
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 950a5fe189..3d1775e973 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -516,7 +516,14 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
       <desc>
         <p>Returns an Erlang term that is the result of decoding
           binary object <c><anno>Binary</anno></c>, which must be encoded
-          according to the Erlang external term format.</p>
+          according to the <seealso marker="erts:erl_ext_dist">
+          Erlang external term format</seealso>.</p>
+        <pre>
+> <input>Bin = term_to_binary(hello).</input>
+&lt;&lt;131,100,0,5,104,101,108,108,111>>
+> <input>hello = binary_to_term(Bin).</input>
+hello
+</pre>
         <warning>
           <p>When decoding binaries from untrusted sources,
             consider using <c>binary_to_term/2</c> to prevent Denial
@@ -555,6 +562,14 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
         </taglist>
         <p>Failure: <c>badarg</c> if <c>safe</c> is specified and unsafe
           data is decoded.</p>
+        <pre>
+> <input>binary_to_term(&lt;&lt;131,100,0,5,104,101,108,108,111>>, [safe]).</input>
+** exception error: bad argument
+> <input>hello.</input>
+hello
+> <input>binary_to_term(&lt;&lt;131,100,0,5,104,101,108,108,111>>, [safe]).</input>
+hello
+</pre>
         <p>See also
           <seealso marker="#term_to_binary/1"><c>term_to_binary/1</c></seealso>,
           <seealso marker="#binary_to_term/1">
@@ -718,6 +733,19 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
+      <name name="ceil" arity="1"/>
+      <fsummary>Returns the smallest integer not less than the argument</fsummary>
+      <desc>
+        <p>Returns the smallest integer not less than
+	<c><anno>Number</anno></c>.
+        For example:</p>
+        <pre>
+> <input>ceil(5.5).</input>
+6</pre>
+        <p>Allowed in guard tests.</p>
+      </desc>
+    </func>
+    <func>
       <name name="check_old_code" arity="1"/>
       <fsummary>Check if a module has old code.</fsummary>
       <desc>
@@ -1465,6 +1493,20 @@ true</pre>
     </func>
 
     <func>
+      <name name="floor" arity="1"/>
+      <fsummary>Returns the largest integer not greater than the argument</fsummary>
+      <desc>
+        <p>Returns the largest integer not greater than
+	<c><anno>Number</anno></c>.
+        For example:</p>
+        <pre>
+> <input>floor(-10.5).</input>
+-11</pre>
+        <p>Allowed in guard tests.</p>
+      </desc>
+    </func>
+
+    <func>
       <name name="fun_info" arity="1"/>
       <fsummary>Information about a fun.</fsummary>
       <desc>
@@ -1652,6 +1694,12 @@ true</pre>
             the form <c>{garbage_collect,
             <anno>RequestId</anno>, <anno>GCResult</anno>}</c>.
           </item>
+
+          <tag><c>{type, 'major' | 'minor'}</c></tag>
+          <item>Triggers garbage collection of requested type. Default value is
+            <c>'major'</c>, which would trigger a fullsweep GC.
+            The option <c>'minor'</c> is considered a hint and may lead to
+            either minor or major GC run.</item>
         </taglist>
         <p>If <c><anno>Pid</anno></c> equals <c>self()</c>, and
           no <c>async</c> option has been passed, the garbage
@@ -2529,13 +2577,6 @@ os_prompt%</pre>
       <name name="load_nif" arity="2"/>
       <fsummary>Load NIF library.</fsummary>
       <desc>
-        <note>
-          <p>Before Erlang/OTP R14B, NIFs were an
-            experimental feature. Versions before Erlang/OTP R14B can
-            have different and possibly incompatible NIF semantics and
-            interfaces. For example, in Erlang/OTP R13B03 the return value on
-            failure was <c>{error,Reason,Text}</c>.</p>
-        </note>
         <p>Loads and links a dynamic library containing native
           implemented functions (NIFs) for a module. <c><anno>Path</anno></c>
           is a file path to the shareable object/dynamic library file minus
@@ -2565,9 +2606,13 @@ os_prompt%</pre>
           <item>The library did not fulfill the requirements as a NIF
             library of the calling module.
           </item>
-          <tag><c>load | reload | upgrade</c></tag>
+          <tag><c>load | upgrade</c></tag>
           <item>The corresponding library callback was unsuccessful.
           </item>
+          <tag><c>reload</c></tag>
+          <item>A NIF library is already loaded for this module instance.
+	    The previously deprecated <c>reload</c> feature was removed in OTP 20.
+          </item>
           <tag><c>old_code</c></tag>
           <item>The call to <c>load_nif/2</c> was made from the old
             code of a module that has been upgraded; this is not
@@ -7175,8 +7220,8 @@ ok
     </func>
 
     <func>
-      <name name="system_info" arity="1" clause_i="10"/>
       <name name="system_info" arity="1" clause_i="11"/>
+      <name name="system_info" arity="1" clause_i="12"/>
       <fsummary>Information about the CPU topology of the system.</fsummary>
       <type name="cpu_topology"/>
       <type name="level_entry"/>
@@ -7276,12 +7321,12 @@ ok
     </func>
 
     <func>
-      <name name="system_info" arity="1" clause_i="27"/>
       <name name="system_info" arity="1" clause_i="28"/>
-      <name name="system_info" arity="1" clause_i="36"/>
+      <name name="system_info" arity="1" clause_i="29"/>
       <name name="system_info" arity="1" clause_i="37"/>
       <name name="system_info" arity="1" clause_i="38"/>
       <name name="system_info" arity="1" clause_i="39"/>
+      <name name="system_info" arity="1" clause_i="40"/>
       <fsummary>Information about the default process heap settings.</fsummary>
       <type name="message_queue_data"/>
       <type name="max_heap_size"/>
@@ -7324,12 +7369,6 @@ ok
               see <seealso marker="#process_flag_max_heap_size">
               <c>process_flag(max_heap_size, MaxHeapSize)</c></seealso>.</p>
           </item>
-          <tag><c>min_heap_size</c></tag>
-          <item>
-            <p>Returns <c>{min_heap_size, <anno>MinHeapSize</anno>}</c>,
-              where <c><anno>MinHeapSize</anno></c> is the current
-              system-wide minimum heap size for spawned processes.</p>
-          </item>
           <tag><marker id="system_info_message_queue_data"/>
             <c>message_queue_data</c></tag>
           <item>
@@ -7342,6 +7381,12 @@ ok
               <seealso marker="#process_flag_message_queue_data">
               <c>process_flag(message_queue_data, MQD)</c></seealso>.</p>
           </item>
+          <tag><c>min_heap_size</c></tag>
+          <item>
+            <p>Returns <c>{min_heap_size, <anno>MinHeapSize</anno>}</c>,
+              where <c><anno>MinHeapSize</anno></c> is the current
+              system-wide minimum heap size for spawned processes.</p>
+          </item>
           <tag><c>min_bin_vheap_size</c></tag>
           <item>
             <p>Returns <c>{min_bin_vheap_size,
@@ -7358,7 +7403,7 @@ ok
       <name name="system_info" arity="1" clause_i="7"/>
       <name name="system_info" arity="1" clause_i="8"/>
       <name name="system_info" arity="1" clause_i="9"/>
-      <name name="system_info" arity="1" clause_i="12"/>
+      <name name="system_info" arity="1" clause_i="10"/>
       <name name="system_info" arity="1" clause_i="13"/>
       <name name="system_info" arity="1" clause_i="14"/>
       <name name="system_info" arity="1" clause_i="15"/>
@@ -7373,14 +7418,14 @@ ok
       <name name="system_info" arity="1" clause_i="24"/>
       <name name="system_info" arity="1" clause_i="25"/>
       <name name="system_info" arity="1" clause_i="26"/>
-      <name name="system_info" arity="1" clause_i="29"/>
+      <name name="system_info" arity="1" clause_i="27"/>
       <name name="system_info" arity="1" clause_i="30"/>
       <name name="system_info" arity="1" clause_i="31"/>
       <name name="system_info" arity="1" clause_i="32"/>
       <name name="system_info" arity="1" clause_i="33"/>
       <name name="system_info" arity="1" clause_i="34"/>
       <name name="system_info" arity="1" clause_i="35"/>
-      <name name="system_info" arity="1" clause_i="40"/>
+      <name name="system_info" arity="1" clause_i="36"/>
       <name name="system_info" arity="1" clause_i="41"/>
       <name name="system_info" arity="1" clause_i="42"/>
       <name name="system_info" arity="1" clause_i="43"/>
@@ -7410,16 +7455,21 @@ ok
       <name name="system_info" arity="1" clause_i="67"/>
       <name name="system_info" arity="1" clause_i="68"/>
       <name name="system_info" arity="1" clause_i="69"/>
+      <name name="system_info" arity="1" clause_i="70"/>
       <fsummary>Information about the system.</fsummary>
       <desc>
         <p>Returns various information about the current system
           (emulator) as specified by <c><anno>Item</anno></c>:</p>
         <taglist>
-          <tag><c>allocated_areas</c>, <c>allocator</c>,
-            <c>alloc_util_allocators</c>, <c>allocator_sizes</c></tag>
+          <tag><c>atom_limit</c></tag>
           <item>
-            <p>See <seealso marker="#system_info_allocator_tags">
-              above</seealso>.</p>
+            <marker id="system_info_atom_limit"></marker>
+            <p>Returns the maximum number of atoms allowed.
+              This limit can be increased at startup by passing
+              command-line flag
+              <seealso marker="erts:erl#+t"><c>+t</c></seealso> to
+              <c>erl(1)</c>.
+            </p>
           </item>
           <tag><c>build_type</c></tag>
           <item>
@@ -8599,12 +8649,19 @@ ok
       </fsummary>
       <desc>
         <p>Returns a binary data object that is the result of encoding
-          <c><anno>Term</anno></c> according to the Erlang external
-          term format.</p>
+          <c><anno>Term</anno></c> according to the
+          <seealso marker="erts:erl_ext_dist">Erlang external
+          term format.</seealso></p>
         <p>This can be used for various purposes, for example,
           writing a term to a file in an efficient way, or sending an
           Erlang term to some type of communications channel not
           supported by distributed Erlang.</p>
+        <pre>
+> <input>Bin = term_to_binary(hello).</input>
+&lt;&lt;131,100,0,5,104,101,108,108,111>>
+> <input>hello = binary_to_term(Bin).</input>
+hello
+</pre>
         <p>See also <seealso marker="#binary_to_term/1">
           <c>binary_to_term/1</c></seealso>.</p>
       </desc>
diff --git a/erts/doc/src/run_erl.xml b/erts/doc/src/run_erl.xml
index ad7b2c5b85..a9b6a7e2c6 100644
--- a/erts/doc/src/run_erl.xml
+++ b/erts/doc/src/run_erl.xml
@@ -49,7 +49,7 @@
   <funcs>
     <func>
       <name>run_erl [-daemon] pipe_dir/ log_dir "exec command
-        [command_arguments]"</name>
+        arg1 arg2 ..."</name>
       <fsummary>Start the Erlang emulator without attached terminal.</fsummary>
       <desc>
         <p>Arguments:</p>
@@ -92,11 +92,10 @@
               </item>
             </list>
           </item>
-          <tag><c>"exec command [command_arguments]"</c></tag>
+          <tag><c>"exec command arg1 arg2 ..."</c></tag>
           <item>
-            <p>In the third argument, <c><![CDATA[command]]></c> is the
-              executable to execute where everything written to <c>stdin</c>
-              and <c>stdout</c> is logged to <c><![CDATA[log_dir]]></c>.</p>
+	    <p>A space-separated string specifying the program to be executed.
+	      The second field is typically a command name such as <c>erl</c>.</p>
           </item>
         </taglist>
       </desc>
@@ -105,7 +104,7 @@
 
   <section>
     <title>Notes concerning the Log Files</title>
-    <p>While running, <c>run_erl</c> (as stated earlier) sends all output,
+    <p>While running, <c>run_erl</c> sends all output,
       uninterpreted, to a log file. The file is named
       <c><![CDATA[erlang.log.N]]></c>, where <c>N</c> is an integer. When the
       log is "full" (default log size is 100 KB), <c>run_erl</c> starts to log
diff --git a/erts/doc/src/zlib.xml b/erts/doc/src/zlib.xml
index 138414a880..e1924fffee 100644
--- a/erts/doc/src/zlib.xml
+++ b/erts/doc/src/zlib.xml
@@ -576,6 +576,18 @@ unpack(Z, Compressed, Dict) ->
     </func>
 
     <func>
+      <name name="inflateGetDictionary" arity="1"/>
+      <fsummary>Return the decompression dictionary.</fsummary>
+      <desc>
+        <p>Returns the decompression dictionary currently in use
+          by the stream. This function must be called between
+          <seealso marker="#inflateInit/1"><c>inflateInit/1,2</c></seealso>
+          and <seealso marker="#inflateEnd/1"><c>inflateEnd</c></seealso>.</p>
+        <p>Only supported if ERTS was compiled with zlib >= 1.2.8.</p>
+      </desc>
+    </func>
+
+    <func>
       <name name="open" arity="0"/>
       <fsummary>Open a stream and return a stream reference.</fsummary>
       <desc>