Merge branch 'rickard/r16/port-optimizations/OTP-10336'

* rickard/r16/port-optimizations/OTP-10336:
  Change annotate level for emacs-22 in cerl
  Update etp-commands
  Add documentation on communication in Erlang
  Add support for busy port message queue
  Add driver callback epilogue
  Implement true asynchronous signaling between processes and ports
  Add erl_drv_[send|output]_term
  Move busy port flag
  Use rwlock for driver list
  Optimize management of port tasks
  Improve configuration of process and port tables
  Remove R9 compatibility features
  Use ptab functionality also for ports
  Prepare for use of ptab functionality also for ports
  Atomic port state
  Generalize process table implementation
  Implement functionality for delaying thread progress from unmanaged threads

7 files changed, 89 insertions, 62 deletions

diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index 776e336aea..98d65abba1 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -766,37 +766,6 @@ type(erlang, node, 0, _) -> t_node();
 type(erlang, node, 1, Xs) ->
   strict(arg_types(erlang, node, 1), Xs, fun (_) -> t_node() end);
 type(erlang, nodes, 0, _) -> t_list(t_node());
-type(erlang, port_call, Arity, Xs) when Arity =:= 2; Arity =:= 3 ->
-  strict(arg_types(erlang, port_call, Arity), Xs, fun (_) -> t_any() end);
-type(erlang, port_info, 1, Xs) ->
-  strict(arg_types(erlang, port_info, 1), Xs,
-	 fun (_) -> t_sup(t_atom('undefined'), t_list()) end);
-type(erlang, port_info, 2, Xs) ->
-  strict(arg_types(erlang, port_info, 2), Xs,
-	 fun ([_Port, Item]) ->
-	     t_sup(t_atom('undefined'),
-		   case t_atom_vals(Item) of
-		     ['connected'] -> t_tuple([Item, t_pid()]);
-		     ['id'] -> t_tuple([Item, t_integer()]);
-		     ['input'] -> t_tuple([Item, t_integer()]);
-		     ['links'] -> t_tuple([Item, t_list(t_pid())]);
-		     ['name'] -> t_tuple([Item, t_string()]);
-		     ['output'] -> t_tuple([Item, t_integer()]);
-		     ['os_pid'] -> t_tuple([Item, t_sup(t_non_neg_integer(),t_atom('undefined'))]);
-		     ['registered_name'] -> t_tuple([Item, t_atom()]);
-		     List when is_list(List) ->
-		       t_tuple([t_sup([t_atom(A) || A <- List]),
-				t_sup([t_atom(), t_integer(),
-				       t_pid(), t_list(t_pid()),
-				       t_string()])]);
-		     unknown ->
-		       [_, PosItem] = arg_types(erlang, port_info, 2),
-		       t_tuple([PosItem,
-				t_sup([t_atom(), t_integer(),
-				       t_pid(), t_list(t_pid()),
-				       t_string()])])		       
-		   end)
-	 end);
 %% Guard bif, needs to be here.
 type(erlang, round, 1, Xs) ->
   strict(arg_types(erlang, round, 1), Xs, fun (_) -> t_integer() end);
@@ -922,6 +891,14 @@ type(erlang, system_info, 1, Xs) ->
 				    t_non_neg_fixnum(),
 				    t_non_neg_fixnum()]),
 			   t_string());
+                   ['otp_release'] ->
+                     t_string();
+		   ['port_parallelism'] ->
+		     t_boolean();
+		   ['port_count'] ->
+		     t_non_neg_fixnum();
+		   ['port_limit'] ->
+		     t_non_neg_fixnum();
 		   ['process_count'] ->
 		     t_non_neg_fixnum();
 		   ['process_limit'] ->
@@ -2275,16 +2252,6 @@ arg_types(erlang, node, 1) ->
   [t_identifier()];
 arg_types(erlang, nodes, 0) ->
   [];
-arg_types(erlang, port_call, 2) ->
-  [t_sup(t_port(), t_atom()), t_any()];
-arg_types(erlang, port_call, 3) ->
-  [t_sup(t_port(), t_atom()), t_integer(), t_any()];
-arg_types(erlang, port_info, 1) ->
-  [t_sup(t_port(), t_atom())];
-arg_types(erlang, port_info, 2) ->
-  [t_sup(t_port(), t_atom()),
-   t_atoms(['registered_name', 'id', 'connected',
-	    'links', 'name', 'input', 'output', 'os_pid'])];
 %% Guard bif, needs to be here.
 arg_types(erlang, round, 1) ->
   [t_number()];
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index c09aadbd74..a1590c2dce 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -556,13 +556,37 @@ fe80::204:acff:fe17:bf38
               <c>[Byte1,Byte2|Binary]</c>.</p>
           </item>
 
-		  <tag><c>{high_watermark, Size}</c></tag>
-		  <item> <p>
-				  Sender is forced busy if sent and enqueued data
-				  reaches the highwater mark.
-				  <br /> Default: 8192 kB. 
-			  </p>
-		  </item>
+          <tag><c>{high_msgq_watermark, Size}</c> (TCP/IP sockets)</tag>
+          <item>
+	    <p>The socket message queue will be set into a busy
+	    state when the amount of data queued on the message
+	    queue reaches this limit. Note that this limit only
+	    concerns data that have not yet reached the ERTS internal
+	    socket implementation. Default value used is 8 kB.</p>
+	    <p>Senders of data to the socket will be suspended if
+	    either the socket message queue is busy, or the socket
+	    itself is busy.</p>
+	    <p>For more information see the <c>low_msgq_watermark</c>,
+	    <c>high_watermark</c>, and <c>low_watermark</c> options.</p>
+	    <p>Note that distribution sockets will disable the use of
+	    <c>high_msgq_watermark</c> and <c>low_msgq_watermark</c>,
+	    and will instead use the
+	    <seealso marker="erts:erlang#system_info_dist_buf_busy_limit">distribution
+	    buffer busy limit</seealso> which is a similar feature.</p>
+          </item>
+
+          <tag><c>{high_watermark, Size}</c> (TCP/IP sockets)</tag>
+          <item>
+	    <p>The socket will be set into a busy state when the amount
+	    of data queued internally by the ERTS socket implementation
+	    reaches this limit. Default value used is 8 kB.</p>
+	    <p>Senders of data to the socket will be suspended if
+	    either the socket message queue is busy, or the socket
+	    itself is busy.</p>
+	    <p>For more information see the <c>low_watermark</c>,
+	    <c>high_msgq_watermark</c>, and <c>low_msqg_watermark</c>
+	    options.</p>
+          </item>
 
 	  <tag><c>{ipv6_v6only, Boolean}</c></tag>
 	  <item>
@@ -647,14 +671,41 @@ fe80::204:acff:fe17:bf38
 				  the flushing time-out in seconds.</p>
 		  </item>
 
-		  <tag><c>{low_watermark, Size}</c></tag>
-		  <item> <p>
-				  If the port has reached its <c>high_watermark</c> it will
-				  force busy onto senders. When the port data queue reaches the
-				  <c>low_watermark</c> callers are no longer forced busy.
-				  <br /> Default: 4096 kB. 
-			  </p>
-		  </item>
+          <tag><c>{low_msgq_watermark, Size}</c> (TCP/IP sockets)</tag>
+          <item>
+	    <p>If the socket message queue is in a busy state, the
+	    socket message queue will be set in a not busy state when
+	    the amount of data queued in the message queue falls
+	    below this limit. Note that this limit only concerns data
+	    that have not yet reached the ERTS internal socket
+	    implementation. Default value used is 4 kB.</p>
+	    <p>Senders that have been suspended due to either a
+	    busy message queue or a busy socket, will be resumed
+	    when neither the socket message queue, nor the socket
+	    are busy.</p>
+	    <p>For more information see the <c>high_msgq_watermark</c>,
+	    <c>high_watermark</c>, and <c>low_watermark</c> options.</p>
+	    <p>Note that distribution sockets will disable the use of
+	    <c>high_msgq_watermark</c> and <c>low_msgq_watermark</c>,
+	    and will instead use the
+	    <seealso marker="erts:erlang#system_info_dist_buf_busy_limit">distribution
+	    buffer busy limit</seealso> which is a similar feature.</p>
+          </item>
+
+          <tag><c>{low_watermark, Size}</c> (TCP/IP sockets)</tag>
+          <item>
+	    <p>If the socket is in a busy state, the socket will
+	    be set in a not busy state when the amount of data
+	    queued internally by the ERTS socket implementation
+	    falls below this limit. Default value used is 4 kB.</p>
+	    <p>Senders that have been suspended due to either a
+	    busy message queue or a busy socket, will be resumed
+	    when neither the socket message queue, nor the socket
+	    are busy.</p>
+	    <p>For more information see the <c>high_watermark</c>,
+	    <c>high_msgq_watermark</c>, and <c>low_msgq_watermark</c>
+	    options.</p>
+          </item>
 
 		  <tag><c>{mode, Mode :: binary | list}</c></tag>
           <item>
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl
index 22e6aa5bc8..ec13ab6d2e 100644
--- a/lib/kernel/src/gen_tcp.erl
+++ b/lib/kernel/src/gen_tcp.erl
@@ -37,9 +37,11 @@
         {dontroute,       boolean()} |
         {exit_on_close,   boolean()} |
         {header,          non_neg_integer()} |
+        {high_msgq_watermark, pos_integer()} |
         {high_watermark,  non_neg_integer()} |
         {keepalive,       boolean()} |
         {linger,          {boolean(), non_neg_integer()}} |
+        {low_msgq_watermark, pos_integer()} |
         {low_watermark,   non_neg_integer()} |
         {mode,            list | binary} | list | binary |
         {nodelay,         boolean()} |
@@ -67,9 +69,11 @@
         dontroute |
         exit_on_close |
         header |
+        high_msgq_watermark |
         high_watermark |
         keepalive |
         linger |
+        low_msgq_watermark |
         low_watermark |
         mode |
         nodelay |
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index 719dd00720..9670271b2e 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -579,6 +579,7 @@ options() ->
      buffer, header, active, packet, deliver, mode,
      multicast_if, multicast_ttl, multicast_loop,
      exit_on_close, high_watermark, low_watermark,
+     high_msgq_watermark, low_msgq_watermark,
      send_timeout, send_timeout_close
     ].
 
@@ -596,8 +597,8 @@ stats() ->
 connect_options() ->
     [tos, priority, reuseaddr, keepalive, linger, sndbuf, recbuf, nodelay,
      header, active, packet, packet_size, buffer, mode, deliver,
-     exit_on_close, high_watermark, low_watermark, send_timeout,
-     send_timeout_close, delay_send,raw].
+     exit_on_close, high_watermark, low_watermark, high_msgq_watermark,
+     low_msgq_watermark, send_timeout, send_timeout_close, delay_send, raw].
     
 connect_options(Opts, Family) ->
     BaseOpts = 
@@ -652,8 +653,9 @@ con_add(Name, Val, R, Opts, AllOpts) ->
 listen_options() ->
     [tos, priority, reuseaddr, keepalive, linger, sndbuf, recbuf, nodelay,
      header, active, packet, buffer, mode, deliver, backlog, ipv6_v6only,
-     exit_on_close, high_watermark, low_watermark, send_timeout,
-     send_timeout_close, delay_send, packet_size,raw].
+     exit_on_close, high_watermark, low_watermark, high_msgq_watermark,
+     low_msgq_watermark, send_timeout, send_timeout_close, delay_send,
+     packet_size, raw].
 
 listen_options(Opts, Family) ->
     BaseOpts = 
diff --git a/lib/kernel/src/inet_int.hrl b/lib/kernel/src/inet_int.hrl
index 6d808b54cd..000119bc74 100644
--- a/lib/kernel/src/inet_int.hrl
+++ b/lib/kernel/src/inet_int.hrl
@@ -141,6 +141,8 @@
 -define(INET_LOPT_READ_PACKETS,  33).
 -define(INET_OPT_RAW,            34).
 -define(INET_LOPT_TCP_SEND_TIMEOUT_CLOSE, 35).
+-define(INET_LOPT_TCP_MSGQ_HIWTRMRK,  36).
+-define(INET_LOPT_TCP_MSGQ_LOWTRMRK,  37).
 % Specific SCTP options: separate range:
 -define(SCTP_OPT_RTOINFO,	 	100).
 -define(SCTP_OPT_ASSOCINFO,	 	101).
diff --git a/lib/kernel/test/global_SUITE.erl b/lib/kernel/test/global_SUITE.erl
index 1cc3eb7c79..b40c50f79f 100644
--- a/lib/kernel/test/global_SUITE.erl
+++ b/lib/kernel/test/global_SUITE.erl
@@ -3821,7 +3821,7 @@ start_node_rel(Name0, Rel, Config) ->
     Name = node_name(Name0, Config),
     {Release, Compat} = case Rel of
                             this ->
-                                {[this], "+R8"};
+                                {[this], ""};
                             Rel when is_atom(Rel) ->
                                 {[{release, atom_to_list(Rel)}], ""};
                             RelList ->
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index e8b28998c1..29c4a0d168 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -1485,7 +1485,8 @@ mandatory_modules() ->
 
 preloaded() ->
     %% Sorted
-    [erl_prim_loader,erlang,init,otp_ring0,prim_file,prim_inet, prim_zip,zlib]. 
+    [erl_prim_loader,erlang,erts_internal,init,otp_ring0,prim_file,prim_inet,
+     prim_zip,zlib]. 
 
 %%______________________________________________________________________
 %% Kernel processes; processes that are specially treated by the init