Merge branch 'master' into sverker/enif_select

Conflicts:
	erts/emulator/beam/erl_binary.h
	erts/emulator/beam/erl_monitors.c
	erts/emulator/beam/erl_nif.c
	erts/emulator/beam/global.h
	erts/emulator/test/nif_SUITE_data/nif_SUITE.c

8 files changed, 65 insertions, 88 deletions

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 4e32118405..29fef7348b 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -638,7 +638,7 @@
           this value also applies to command-line parameters and environment
           variables (see section <seealso
           marker="stdlib:unicode_usage#unicode_in_environment_and_parameters">
-          Unicode in Enviroment and Parameters</seealso> in the STDLIB
+          Unicode in Environment and Parameters</seealso> in the STDLIB
           User's Guide).</p>
       </item>
       <tag><c><![CDATA[+fnu[{w|i|e}]]]></c></tag>
@@ -674,7 +674,7 @@
           this value also applies to command-line parameters and environment
           variables (see section <seealso
           marker="stdlib:unicode_usage#unicode_in_environment_and_parameters">
-          Unicode in Enviroment and Parameters</seealso> in the STDLIB
+          Unicode in Environment and Parameters</seealso> in the STDLIB
           User's Guide).</p>
       </item>
       <tag><c><![CDATA[+fna[{w|i|e}]]]></c></tag>
@@ -695,7 +695,7 @@
           this value also applies to command-line parameters and environment
           variables (see section <seealso
           marker="stdlib:unicode_usage#unicode_in_environment_and_parameters">
-          Unicode in Enviroment and Parameters</seealso> in the STDLIB
+          Unicode in Environment and Parameters</seealso> in the STDLIB
           User's Guide).</p>
       </item>
       <tag><c><![CDATA[+hms Size]]></c></tag>
diff --git a/erts/doc/src/erl_driver.xml b/erts/doc/src/erl_driver.xml
index d8bf45c523..7fbe97bc0b 100644
--- a/erts/doc/src/erl_driver.xml
+++ b/erts/doc/src/erl_driver.xml
@@ -1103,8 +1103,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
         <marker id="driver_binary_dec_refc"></marker>
         <p>Decrements the reference count on <c>bin</c> and returns
           the reference count reached after the decrement.</p>
-        <p>This function is only thread-safe when the emulator with SMP
-          support is used.</p>
+        <p>This function is thread-safe.</p>
         <note>
           <p>The reference count of driver binary is normally to be decremented
             by calling <seealso marker="#driver_free_binary">
@@ -1124,8 +1123,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
       <desc>
         <marker id="driver_binary_get_refc"></marker>
         <p>Returns the current reference count on <c>bin</c>.</p>
-        <p>This function is only thread-safe when the emulator with SMP
-          support is used.</p>
+        <p>This function is thread-safe.</p>
       </desc>
     </func>
 
@@ -1137,8 +1135,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
         <marker id="driver_binary_inc_refc"></marker>
         <p>Increments the reference count on <c>bin</c> and returns
           the reference count reached after the increment.</p>
-        <p>This function is only thread-safe when the emulator with SMP
-          support is used.</p>
+        <p>This function is thread-safe.</p>
       </desc>
     </func>
 
@@ -1434,8 +1431,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
         <seealso marker="#driver_alloc_binary">
         <c>driver_alloc_binary</c></seealso>. As binaries
           in Erlang are reference counted, the binary can still be around.</p>
-        <p>This function is only thread-safe when the emulator with SMP
-          support is used.</p>
+        <p>This function is thread-safe.</p>
       </desc>
     </func>
 
@@ -1872,8 +1868,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
         <p>Resizes a driver binary, while keeping the data.</p>
         <p>Returns the resized driver binary on success. Returns <c>NULL</c>
           on failure (out of memory).</p>
-        <p>This function is only thread-safe when the emulator with SMP
-          support is used.</p>
+        <p>This function is thread-safe.</p>
       </desc>
     </func>
 
diff --git a/erts/doc/src/erl_ext_dist.xml b/erts/doc/src/erl_ext_dist.xml
index 4f799f8f34..a436a9ca74 100644
--- a/erts/doc/src/erl_ext_dist.xml
+++ b/erts/doc/src/erl_ext_dist.xml
@@ -119,16 +119,11 @@
     <tcaption>Compressed Data Format when Expanded</tcaption></table>
     <marker id="utf8_atoms"/>
     <note>
-      <p>As from ERTS 5.10 (OTP R16) support
-        for UTF-8 encoded atoms has been introduced in the external format.
-        However, only characters that can be encoded using Latin-1 (ISO-8859-1)
-        are currently supported in atoms. The support for UTF-8 encoded atoms
-        in the external format has been implemented to be able to support
-        all Unicode characters in atoms in <em>some future release</em>.
-        Until full Unicode support for atoms has been introduced,
-        it is an <em>error</em> to pass atoms containing
-        characters that cannot be encoded in Latin-1, and <em>the behavior is
-        undefined</em>.</p>
+      <p>As from ERTS 9.0 (OTP 20), UTF-8 encoded atoms may contain any Unicode
+        character. Although the support for UTF-8 encoded atoms in the external
+        format is available since ERTS 5.10 (OTP R16), passing atoms that cannot
+        be encoded in Latin-1 is an <em>error</em> in versions earlier than
+        Erlang/OTP 20, and <em>the behavior is undefined</em>.</p>
       <p>When distribution flag <seealso marker="erl_dist_protocol#dflags">
         <c>DFLAG_UTF8_ATOMS</c></seealso> has been exchanged between both nodes
         in the <seealso marker="erl_dist_protocol#distribution_handshake">
diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml
index e8e7bd4a80..a55092332e 100644
--- a/erts/doc/src/erl_nif.xml
+++ b/erts/doc/src/erl_nif.xml
@@ -2564,7 +2564,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
               CPU-bound, or <c>ERL_NIF_DIRTY_JOB_IO_BOUND</c> for
               jobs that will be I/O-bound. If dirty scheduler threads are not
               available in the emulator, an attempt to schedule such a job
-              results in a <c>badarg</c> exception.</p>
+              results in a <c>notsup</c> exception.</p>
           </item>
           <tag><c>argc</c> and <c>argv</c></tag>
           <item>
diff --git a/erts/doc/src/erl_tracer.xml b/erts/doc/src/erl_tracer.xml
index 43613c31b1..2681a19da0 100644
--- a/erts/doc/src/erl_tracer.xml
+++ b/erts/doc/src/erl_tracer.xml
@@ -103,7 +103,7 @@
           <item>If set the tracer has been requested to include a
             time stamp.</item>
           <tag><c>extra</c></tag>
-          <item>If set the tracepoint has included additonal data about
+          <item>If set the tracepoint has included additional data about
             the trace event. What the additional data is depends on which
             <c>TraceTag</c> has been triggered. The <c>extra</c> trace data
             corresponds to the fifth element in the trace tuples described in
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 7815bfa510..352d30f3b4 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -325,16 +325,11 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
           is <c>latin1</c>, one byte exists for each character
           in the text representation. If <c><anno>Encoding</anno></c> is
           <c>utf8</c> or
-          <c>unicode</c>, the characters are encoded using UTF-8
-          (that is, characters from 128 through 255 are
-          encoded in two bytes).</p>
+          <c>unicode</c>, the characters are encoded using UTF-8 where
+          characters may require multiple bytes.</p>
         <note>
-          <p><c>atom_to_binary(<anno>Atom</anno>, latin1)</c> never
-            fails, as the text representation of an atom can only
-            contain characters from 0 through 255. In a future release,
-            the text representation
-            of atoms can be allowed to contain any Unicode character and
-            <c>atom_to_binary(<anno>Atom</anno>, latin1)</c> then fails if the
+          <p>As from Erlang/OTP 20, atoms can contain any Unicode character
+            and <c>atom_to_binary(<anno>Atom</anno>, latin1)</c> may fail if the
             text representation for <c><anno>Atom</anno></c> contains a Unicode
             character &gt; 255.</p>
         </note>
@@ -402,13 +397,11 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
           translation of bytes in the binary is done.
           If <c><anno>Encoding</anno></c>
           is <c>utf8</c> or <c>unicode</c>, the binary must contain
-          valid UTF-8 sequences. Only Unicode characters up
-          to 255 are allowed.</p>
+          valid UTF-8 sequences.</p>
         <note>
-          <p><c>binary_to_atom(<anno>Binary</anno>, utf8)</c> fails if
-            the binary contains Unicode characters &gt; 255.
-            In a future release, such Unicode characters can be allowed and
-            <c>binary_to_atom(<anno>Binary</anno>, utf8)</c> does then not fail.
+          <p>As from Erlang/OTP 20, <c>binary_to_atom(<anno>Binary</anno>, utf8)</c>
+            is capable of encoding any Unicode character. Earlier versions would
+            fail if the binary contained Unicode characters &gt; 255.
             For more information about Unicode support in atoms, see the
             <seealso marker="erl_ext_dist#utf8_atoms">note on UTF-8
             encoded atoms</seealso>
@@ -419,9 +412,7 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
 > <input>binary_to_atom(&lt;&lt;"Erlang"&gt;&gt;, latin1).</input>
 'Erlang'
 > <input>binary_to_atom(&lt;&lt;1024/utf8&gt;&gt;, utf8).</input>
-** exception error: bad argument
-     in function  binary_to_atom/2
-        called as binary_to_atom(&lt;&lt;208,128&gt;&gt;,utf8)</pre>
+'Ѐ'</pre>
       </desc>
     </func>
 
@@ -1955,26 +1946,6 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="hash" arity="2"/>
-      <fsummary>Hash function (deprecated).</fsummary>
-      <desc>
-        <p>Returns a hash value for <c><anno>Term</anno></c> within the range
-          <c>1..<anno>Range</anno></c>. The maximum range is 1..2^27-1.</p>
-        <warning>
-          <p><em>This BIF is deprecated, as the hash value can differ on
-            different architectures.</em> The hash values for integer
-            terms &gt; 2^27 and large binaries are
-            poor. The BIF is retained for backward compatibility
-            reasons (it can have been used to hash records into a file),
-            but all new code is to use one of the BIFs
-            <seealso marker="#phash/2"><c>erlang:phash/2</c></seealso> or
-            <seealso marker="#phash2/1"><c>erlang:phash2/1,2</c></seealso>
-            instead.</p>
-        </warning>
-      </desc>
-    </func>
-
-    <func>
       <name name="hd" arity="1"/>
       <fsummary>Head of a list.</fsummary>
       <desc>
@@ -2401,10 +2372,10 @@ os_prompt%</pre>
       <desc>
         <p>Returns the atom whose text representation is
           <c><anno>String</anno></c>.</p>
-        <p><c><anno>String</anno></c> can only contain ISO-latin-1
-          characters (that is, numbers &lt; 256) as the implementation does not
-          allow Unicode characters equal to or above 256 in atoms.
-          For more information on Unicode support in atoms, see
+        <p>As from Erlang/OTP 20, <c><anno>String</anno></c> may contain
+          any Unicode character. Earlier versions allowed only ISO-latin-1
+          characters as the implementation did not allow Unicode characters
+          above 255. For more information on Unicode support in atoms, see
           <seealso marker="erl_ext_dist#utf8_atoms">note on UTF-8
           encoded atoms</seealso>
           in section "External Term Format" in the User's Guide.</p>
@@ -3818,9 +3789,6 @@ RealSystem = system + MissedSystem</code>
           <c><anno>Term</anno></c> within the range
           <c>1..<anno>Range</anno></c>. The maximum value for
           <c><anno>Range</anno></c> is 2^32.</p>
-        <p>This BIF can be used instead of the old deprecated BIF
-          <c>erlang:hash/2</c>, as it calculates better hashes for
-          all data types, but consider using <c>phash2/1,2</c> instead.</p>
       </desc>
     </func>
 
@@ -3855,10 +3823,6 @@ RealSystem = system + MissedSystem</code>
       <desc>
         <p>Returns a string corresponding to the text
           representation of <c><anno>Pid</anno></c>.</p>
-        <warning>
-          <p>This BIF is intended for debugging and is not to be used
-            in application programs.</p>
-        </warning>
       </desc>
     </func>
 
@@ -4431,10 +4395,6 @@ RealSystem = system + MissedSystem</code>
       <desc>
         <p>Returns a string corresponding to the text
           representation of the port identifier <c><anno>Port</anno></c>.</p>
-        <warning>
-          <p>This BIF is intended for debugging. It is not to be used
-            in application programs.</p>
-        </warning>
       </desc>
     </func>
 
@@ -4631,7 +4591,7 @@ RealSystem = system + MissedSystem</code>
         <p>If the process potentially can get many messages,
           you are advised to set the flag to <c>off_heap</c>. This
           because a garbage collection with many messages placed on
-          the heap can become extremly expensive and the process can
+          the heap can become extremely expensive and the process can
           consume large amounts of memory. Performance of the
           actual message passing is however generally better when not
           using flag <c>off_heap</c>.</p>
diff --git a/erts/doc/src/erts_alloc.xml b/erts/doc/src/erts_alloc.xml
index 8ab35851c1..49dadfb42c 100644
--- a/erts/doc/src/erts_alloc.xml
+++ b/erts/doc/src/erts_alloc.xml
@@ -452,7 +452,7 @@
             utilization value &gt; 0 is used, allocator instances
             are allowed to abandon multiblock carriers. If <c>de</c> (default
             enabled) is passed instead of a <c><![CDATA[<utilization>]]></c>,
-            a recomended non-zero utilization value is used. The value
+            a recommended non-zero utilization value is used. The value
             chosen depends on the allocator type and can be changed between
             ERTS versions. Defaults to <c>de</c>, but this
             can be changed in the future.</p>
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 812538729d..05142c9338 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -32,12 +32,39 @@
   <p>This document describes the changes made to the ERTS application.</p>
 
 
-<section><title>Erts 8.2.1</title>
+<section><title>Erts 8.2.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
         <item>
           <p>
+	    Fix bug in <c>binary_to_term</c> for binaries created by
+	    <c>term_to_binary </c> with option <c>compressed</c>. The
+	    bug can cause <c>badarg</c> exception for a valid binary
+	    when Erlang VM is linked against a <c>zlib</c> library of
+	    version 1.2.9 or newer. Bug exists since OTP 17.0.</p>
+          <p>
+	    Own Id: OTP-14159 Aux Id: ERL-340 </p>
+        </item>
+        <item>
+          <p>
+	    The driver efile_drv when opening a file now use fstat()
+	    on the open file instead of stat() before opening, if
+	    fstat() exists. This avoids a race when the file happens
+	    to change between stat() and open().</p>
+          <p>
+	    Own Id: OTP-14184 Aux Id: seq-13266 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 8.2.1</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
 	    Fix a quite rare bug causing VM crash during code loading
 	    and the use of export funs (fun M:F/A) of not yet loaded
 	    modules. Requires a very specfic timing of concurrent
@@ -537,7 +564,7 @@
       <list>
         <item>
           <p>
-	    Fixed a VM crash that occured in a garbage collection of
+	    Fixed a VM crash that occurred in a garbage collection of
 	    a process when it had received binaries. This bug was
 	    introduced in ERTS version 8.0 (OTP 19.0).</p>
           <p>
@@ -554,7 +581,7 @@
       <list>
         <item>
           <p>
-	    Fixed a VM crash that occured in garbage collection of a
+	    Fixed a VM crash that occurred in garbage collection of a
 	    process when it had received maps over the distribution.
 	    This bug was introduced in ERTS version 8.0 (OTP 19.0).</p>
           <p>
@@ -5655,7 +5682,7 @@
 	    dependent, so applications aiming to be portable should
 	    consider using <c>{ipv6_v6only,true}</c> when creating an
 	    <c>inet6</c> listening/destination socket, and if
-	    neccesary also create an <c>inet</c> socket on the same
+	    necessary also create an <c>inet</c> socket on the same
 	    port for IPv4 traffic. See the documentation.</p>
           <p>
 	    Own Id: OTP-8928 Aux Id: kunagi-193 [104] </p>
@@ -6036,7 +6063,7 @@
 	    This change of default value will reduce lock contention
 	    on ETS tables using the <c>read_concurrency</c> option at
 	    the expense of memory consumption when the amount of
-	    schedulers and logical processors are beween 8 and 64.
+	    schedulers and logical processors are between 8 and 64.
 	    For more information, see documentation of the <c>+rg</c>
 	    command line argument of <c>erl(1)</c>.</p>
           <p>
@@ -7013,7 +7040,7 @@
           <p>
 	    For the subsection about process_flag(save_calls, N)
 	    there's an unrelated paragraph about process priorities
-	    which was copied from the preceeding subsection regarding
+	    which was copied from the preceding subsection regarding
 	    process_flag(priority, Level). (Thanks to Filipe David
 	    Manana)</p>
           <p>
@@ -8228,7 +8255,7 @@
         <item>
           <p>
 	    Wx on MacOS X generated complains on stderr about certain
-	    cocoa functions not beeing called from the "Main thread".
+	    cocoa functions not being called from the "Main thread".
 	    This is now corrected.</p>
           <p>
 	    Own Id: OTP-9081</p>
@@ -9219,7 +9246,7 @@
         </item>
         <item>
 	    <p>The <c>empd</c> program could loop and consume 100%
-	    CPU time if an unexpected error ocurred in
+	    CPU time if an unexpected error occurred in
 	    <c>listen()</c> or <c>accept()</c>. Now <c>epmd</c> will
 	    terminate if a non-recoverable error occurs. (Thanks to
 	    Michael Santos.)</p>