Merge branch 'bmk/erts/esock/20190614/split_modules/OTP-15765' into maint

14 files changed, 61 insertions, 222 deletions

diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile
index bc01919da1..bb96293947 100644
--- a/erts/doc/src/Makefile
+++ b/erts/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2018. All Rights Reserved.
+# Copyright Ericsson AB 1997-2019. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -47,6 +47,20 @@ XML_REF1_FILES = epmd.xml \
 	run_erl.xml \
 	start.xml
 
+ifeq ($(USE_ESOCK), yes)
+XML_REF3_ESOCK_EFILES = socket.xml
+XML_CHAPTER_ESOCK_EFILES = socket_usage.xml
+ESOCK_USE_SOCKET_XML=<xi:include href="socket.xml"\/>
+ESOCK_USE_SOCKET_SPECS_XML=<xi:include href="../specs/specs_socket.xml"/>
+ESOCK_USE_SOCKET_USAGE_XML=<xi:include href="socket_usage.xml"/>
+else
+XML_REF3_ESOCK_EFILES =
+XML_CHAPTER_ESOCK_EFILES =
+ESOCK_USE_SOCKET_XML =
+ESOCK_USE_SOCKET_SPECS_XML =
+ESOCK_USE_SOCKET_USAGE_XML =
+endif
+
 XML_REF3_EFILES = \
 	erl_prim_loader.xml \
 	erlang.xml \
@@ -56,8 +70,7 @@ XML_REF3_EFILES = \
 	atomics.xml \
 	counters.xml \
 	zlib.xml \
-	socket.xml \
-	net.xml
+	$(XML_REF3_ESOCK_EFILES)
 
 XML_REF3_FILES = \
 	$(XML_REF3_EFILES) \
@@ -94,7 +107,7 @@ XML_CHAPTER_FILES = \
 	driver.xml \
 	absform.xml \
 	inet_cfg.xml \
-	socket_usage.xml \
+	$(XML_CHAPTER_ESOCK_EFILES) \
 	erl_ext_dist.xml \
 	erl_dist_protocol.xml \
 	communication.xml \
@@ -159,7 +172,7 @@ $(HTMLDIR)/%.gif: %.gif
 $(XML_FIGURE_DIR)/%.png: ../../emulator/internal_doc/figures/%.png
 	$(INSTALL_DATA) $< $@
 
-docs: figures man pdf html $(INFO_FILE)
+docs: part ref_man specs figures man pdf html $(INFO_FILE)
 
 $(TOP_PDF_FILE): $(XML_FILES)
 
@@ -169,6 +182,10 @@ html: gifs $(HTML_REF_MAN_FILE)
 
 man: $(MAN1_FILES) $(MAN3_FILES)
 
+ref_man: ref_man.xml
+part: part.xml
+specs: specs.xml
+
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
 
 $(INFO_FILE): $(INFO_FILE_SRC) $(ERL_TOP)/make/$(TARGET)/otp.mk
@@ -196,6 +213,19 @@ $(SPECDIR)/specs_%.xml:
 $(XMLDIR)/%.xml: ../../emulator/internal_doc/%.md $(ERL_TOP)/make/emd2exml
 	$(ERL_TOP)/make/emd2exml $< $@
 
+ref_man.xml: ref_man.xml.src
+	($(PERL) -p -e 's?%ESOCK_USE_SOCKET_XML%?$(ESOCK_USE_SOCKET_XML)?' \
+            $<) > $@
+
+part.xml: part.xml.src
+	($(PERL) -p -e 's?%ESOCK_USE_SOCKET_USAGE_XML%?$(ESOCK_USE_SOCKET_USAGE_XML)?' \
+            $<) > $@
+
+specs.xml: specs.xml.src
+	($(PERL) -p -e 's?%ESOCK_USE_SOCKET_SPECS_XML%?$(ESOCK_USE_SOCKET_SPECS_XML)?' \
+            $<) > $@
+
+
 # ----------------------------------------------------
 # Release Target
 # ----------------------------------------------------
diff --git a/erts/doc/src/net.xml b/erts/doc/src/net.xml
deleted file mode 100644
index 6fbc37076c..0000000000
--- a/erts/doc/src/net.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2018</year><year>2018</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>net</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-    <file>net.xml</file>
-  </header>
-  <module since="OTP 22.0">net</module>
-  <modulesummary>Network interface.</modulesummary>
-  <description>
-    <p>This module provides an API for the network interface.</p>
-    <note>
-      <p>There is currently <em>no</em> support for Windows. </p>
-    </note>
-  </description>
-
-  <datatypes>
-    <datatype>
-      <name name="address_info"/>
-    </datatype>
-    <datatype>
-      <name name="name_info"/>
-    </datatype>
-    <datatype>
-      <name name="name_info_flags"/>
-    </datatype>
-    <datatype>
-      <name name="name_info_flag"/>
-    </datatype>
-    <datatype>
-      <name name="name_info_flag_ext"/>
-    </datatype>
-    <datatype>
-      <name name="network_interface_name"/>
-    </datatype>
-    <datatype>
-      <name name="network_interface_index"/>
-    </datatype>
-  </datatypes>
-
-  <funcs>
-    <func>
-      <name name="gethostname" arity="0"/>
-      <fsummary>Get hostname.</fsummary>
-      <desc>
-        <p>Returns the name of the current host.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="getnameinfo" arity="1" since="OTP 22.0"/>
-      <name name="getnameinfo" arity="2" since="OTP 22.0"/>
-      <fsummary>Address-to-name transaltion.</fsummary>
-      <desc>
-        <p>Address-to-name translation in a protocol-independant manner.</p>
-	<p>This function is the inverse of
-	<seealso marker="#getaddrinfo/1"><c>getaddrinfo</c></seealso>.
-	It converts a socket address to a corresponding host and service.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="getaddrinfo" arity="1" since="OTP 22.0"/>
-      <name name="getaddrinfo" arity="2" clause_i="1" since="OTP 22.0"/>
-      <name name="getaddrinfo" arity="2" clause_i="2" since="OTP 22.0"/>
-      <name name="getaddrinfo" arity="2" clause_i="3" since="OTP 22.0"/>
-      <fsummary>Network address and service transation.</fsummary>
-      <desc>
-	<p>Network address and service translation.</p>
-	<p>This function is the inverse of
-	<seealso marker="#getnameinfo/1"><c>getnameinfo</c></seealso>.
-	It converts host and service to a corresponding socket address.</p>
-	<p>One of the <c>Host</c> and <c>Service</c> may be <c>undefined</c>
-	but <em>not</em> both.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="if_name2index" arity="1" since="OTP 22.0"/>
-      <fsummary>Mappings between network interface names and indexes.</fsummary>
-      <desc>
-        <p>Mappings between network interface names and indexes.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="if_index2name" arity="1" since="OTP 22.0"/>
-      <fsummary>Mappings between network interface index and names.</fsummary>
-      <desc>
-        <p>Mappings between network interface index and names.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="if_names" arity="0" since="OTP 22.0"/>
-      <fsummary>Get network interface names and indexes.</fsummary>
-      <desc>
-        <p>Get network interface names and indexes.</p>
-      </desc>
-    </func>
-
-  </funcs>
-
-</erlref>
-
diff --git a/erts/doc/src/part.xml b/erts/doc/src/part.xml.src
index f0b8a00b90..9b20beffad 100644
--- a/erts/doc/src/part.xml
+++ b/erts/doc/src/part.xml.src
@@ -4,7 +4,7 @@
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2018</year>
+      <year>1996</year><year>2019</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -42,7 +42,7 @@
   <xi:include href="tty.xml"/>
   <xi:include href="driver.xml"/>
   <xi:include href="inet_cfg.xml"/>
-  <xi:include href="socket_usage.xml"/>
+  %ESOCK_USE_SOCKET_USAGE_XML%
   <xi:include href="erl_ext_dist.xml"/>
   <xi:include href="erl_dist_protocol.xml"/>
 </part>
diff --git a/erts/doc/src/ref_man.xml b/erts/doc/src/ref_man.xml.src
index 80cdcf9145..7dd003763c 100644
--- a/erts/doc/src/ref_man.xml
+++ b/erts/doc/src/ref_man.xml.src
@@ -4,7 +4,7 @@
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2018</year>
+      <year>1996</year><year>2019</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -46,10 +46,9 @@
   <xi:include href="erts_alloc.xml"/>
   <xi:include href="escript.xml"/>
   <xi:include href="init.xml"/>
-  <xi:include href="net.xml"/>
   <xi:include href="persistent_term.xml"/>
   <xi:include href="run_erl.xml"/>
-  <xi:include href="socket.xml"/>
+  %ESOCK_USE_SOCKET_XML%
   <xi:include href="start.xml"/>
   <xi:include href="start_erl.xml"/>
   <xi:include href="werl.xml"/>
diff --git a/erts/doc/src/specs.xml b/erts/doc/src/specs.xml.src
index 68fab5edf1..54224c15f5 100644
--- a/erts/doc/src/specs.xml
+++ b/erts/doc/src/specs.xml.src
@@ -5,8 +5,7 @@
   <xi:include href="../specs/specs_erl_tracer.xml"/>
   <xi:include href="../specs/specs_init.xml"/>
   <xi:include href="../specs/specs_persistent_term.xml"/>
-  <xi:include href="../specs/specs_socket.xml"/>
-  <xi:include href="../specs/specs_net.xml"/>
+  %ESOCK_USE_SOCKET_SPECS_XML%
   <xi:include href="../specs/specs_zlib.xml"/>
   <xi:include href="../specs/specs_atomics.xml"/>
   <xi:include href="../specs/specs_counters.xml"/>
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index a9f3bb8e89..ba5ba8abef 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -636,10 +636,9 @@ GENERATE += $(TTF_DIR)/driver_tab.c
 ifeq ($(USE_ESOCK), yes)
 ESOCK_PRELOAD_BEAM = \
 	$(ERL_TOP)/erts/preloaded/ebin/socket.beam \
-	$(ERL_TOP)/erts/preloaded/ebin/net.beam
+	$(ERL_TOP)/erts/preloaded/ebin/prim_net.beam
 else
-ESOCK_PRELOAD_BEAM = \
-	$(ERL_TOP)/erts/preloaded/ebin/net.beam
+ESOCK_PRELOAD_BEAM =
 endif
 
 PRELOAD_BEAM =	$(ERL_TOP)/erts/preloaded/ebin/erts_code_purger.beam \
@@ -850,7 +849,7 @@ ifeq ($(USE_ESOCK), yes)
 
 ESOCK_NIF_OBJS = \
 	$(OBJDIR)/socket_nif.o \
-	$(OBJDIR)/net_nif.o
+	$(OBJDIR)/prim_net_nif.o
 
 ifneq ($(TARGET), win32)
 # These are *currently* only needed for non-win32,
diff --git a/erts/emulator/nifs/common/net_nif.c b/erts/emulator/nifs/common/prim_net_nif.c
index 8a69052935..11a8ff724e 100644
--- a/erts/emulator/nifs/common/net_nif.c
+++ b/erts/emulator/nifs/common/prim_net_nif.c
@@ -1653,4 +1653,4 @@ LOCAL_ERROR_REASON_ATOMS
     return !net;
 }
 
-ERL_NIF_INIT(net, net_funcs, on_load, NULL, NULL, NULL)
+ERL_NIF_INIT(prim_net, net_funcs, on_load, NULL, NULL, NULL)
diff --git a/erts/emulator/test/net_SUITE.erl b/erts/emulator/test/net_SUITE.erl
index 6111fc76a5..c6e77a5373 100644
--- a/erts/emulator/test/net_SUITE.erl
+++ b/erts/emulator/test/net_SUITE.erl
@@ -20,6 +20,8 @@
 
 %%
 %% This test suite is basically a "placeholder" for a proper test suite...
+%% Also we should really call prim_net directly, and not net (since that does
+%% not even reside here).
 %%
 
 %% Run the entire test suite: 
@@ -127,6 +129,7 @@ api_basic_cases() ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 init_per_suite(Config) ->
+    %% We test on the socket module for simplicity
     case lists:member(socket, erlang:loaded()) of
         true ->
             case os:type() of
diff --git a/erts/preloaded/ebin/erl_init.beam b/erts/preloaded/ebin/erl_init.beam
index 0c032e8e91..bc7639781c 100644
--- a/erts/preloaded/ebin/erl_init.beam
+++ b/erts/preloaded/ebin/erl_init.beam
diff --git a/erts/preloaded/ebin/net.beam b/erts/preloaded/ebin/net.beam
deleted file mode 100644
index 88d546a3af..0000000000
--- a/erts/preloaded/ebin/net.beam
+++ /dev/null
diff --git a/erts/preloaded/ebin/prim_net.beam b/erts/preloaded/ebin/prim_net.beam
new file mode 100644
index 0000000000..9d50b3210f
--- /dev/null
+++ b/erts/preloaded/ebin/prim_net.beam
diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile
index 27d450c873..e1bb2ee5c4 100644
--- a/erts/preloaded/src/Makefile
+++ b/erts/preloaded/src/Makefile
@@ -36,10 +36,9 @@ include $(ERL_TOP)/lib/kernel/vsn.mk
 ifeq ($(USE_ESOCK), yes)
 PRE_LOADED_ERL_ESOCK_MODULES = \
 	socket \
-	net
+	prim_net
 else
-PRE_LOADED_ERL_ESOCK_MODULES = \
-	net
+PRE_LOADED_ERL_ESOCK_MODULES =
 endif
 
 PRE_LOADED_ERL_MODULES = \
@@ -82,9 +81,9 @@ APP_FILE= erts.app
 APP_SRC= $(APP_FILE).src
 APP_TARGET= $(STATIC_EBIN)/$(APP_FILE)
 ifeq ($(USE_ESOCK), yes)
-APP_ESOCK_MODS= net, socket
+APP_ESOCK_MODS= prim_net, socket
 else
-APP_ESOCK_MODS= net
+APP_ESOCK_MODS=
 endif
 
 
diff --git a/erts/preloaded/src/erl_init.erl b/erts/preloaded/src/erl_init.erl
index d209c4033b..dadf7dda6f 100644
--- a/erts/preloaded/src/erl_init.erl
+++ b/erts/preloaded/src/erl_init.erl
@@ -35,7 +35,8 @@ start(Mod, BootArgs) ->
     erl_tracer:on_load(),
     prim_buffer:on_load(),
     prim_file:on_load(),
-    conditional_load(socket, [socket, net]), % socket:on_load(), net:on_load(),
+    %% socket:on_load(), prim_net:on_load(),
+    conditional_load(socket, [socket, prim_net]),
     %% Proceed to the specified boot module
     run(Mod, boot, BootArgs).
 
@@ -49,7 +50,9 @@ run(M, F, A) ->
     end.
 
 conditional_load(CondMod, Mods2Load) ->
-    conditional_load(CondMod, erlang:loaded(), Mods2Load).
+    Loaded = erlang:loaded(),
+    %% erlang:display({?MODULE, conditional_load, Loaded}),
+    conditional_load(CondMod, Loaded, Mods2Load).
 
 conditional_load(_CondMod, [], _Mods2LOad) ->
     ok;
diff --git a/erts/preloaded/src/net.erl b/erts/preloaded/src/prim_net.erl
index 13d2e3a117..107043d1aa 100644
--- a/erts/preloaded/src/net.erl
+++ b/erts/preloaded/src/prim_net.erl
@@ -18,7 +18,7 @@
 %% %CopyrightEnd%
 %%
 
--module(net).
+-module(prim_net).
 
 -compile(no_native).
 
@@ -31,22 +31,14 @@
 
 -export([
          gethostname/0,
-         getnameinfo/1, getnameinfo/2,
-         getaddrinfo/1, getaddrinfo/2,
+         getnameinfo/2,
+         getaddrinfo/2,
 
          if_name2index/1,
          if_index2name/1,
          if_names/0
         ]).
 
-%% Deprecated functions from the "old" net module
--export([call/4,
-	 cast/4,
-	 broadcast/3,
-	 ping/1,
-	 relay/1,
-	 sleep/1]).
-
 -export_type([
               address_info/0,
               name_info/0,
@@ -59,13 +51,6 @@
               network_interface_index/0
              ]).
 
--deprecated({call,      4, eventually}).
--deprecated({cast,      4, eventually}).
--deprecated({broadcast, 3, eventually}).
--deprecated({ping,      1, eventually}).
--deprecated({relay,     1, eventually}).
--deprecated({sleep,     1, eventually}).
-
 
 -type name_info_flags()         :: [name_info_flag()|name_info_flag_ext()].
 -type name_info_flag()          :: namereqd |
@@ -88,21 +73,6 @@
 
 %% ===========================================================================
 %%
-%% D E P R E C A T E D   F U N C T I O N S
-%%
-%% ===========================================================================
-
-call(N,M,F,A) -> rpc:call(N,M,F,A).
-cast(N,M,F,A) -> rpc:cast(N,M,F,A).
-broadcast(M,F,A) -> rpc:eval_everywhere(M,F,A).
-ping(Node) -> net_adm:ping(Node).
-sleep(T) -> receive after T -> ok end.
-relay(X) -> slave:relay(X).
-
-
-
-%% ===========================================================================
-%%
 %% Administrative and utility API
 %%
 %% ===========================================================================
@@ -117,7 +87,7 @@ on_load() ->
       Extra :: map().
 
 on_load(Extra) ->
-    ok = erlang:load_nif(atom_to_list(?MODULE), Extra).
+    ok = erlang:load_nif(atom_to_list(net), Extra).
 
 
 -spec info() -> list().
@@ -159,14 +129,6 @@ gethostname() ->
 %%
 %%
 
--spec getnameinfo(SockAddr) -> {ok, Info} | {error, Reason} when
-      SockAddr :: socket:sockaddr(),
-      Info     :: name_info(),
-      Reason   :: term().
-
-getnameinfo(SockAddr) ->
-    getnameinfo(SockAddr, undefined).
-
 -spec getnameinfo(SockAddr, Flags) -> {ok, Info} | {error, Reason} when
       SockAddr :: socket:sockaddr(),
       Flags    :: name_info_flags() | undefined,
@@ -178,44 +140,18 @@ getnameinfo(SockAddr, [] = _Flags) ->
 getnameinfo(#{family := Fam, addr := _Addr} = SockAddr, Flags)
   when ((Fam =:= inet) orelse (Fam =:= inet6)) andalso 
        (is_list(Flags) orelse (Flags =:= undefined)) ->
-    nif_getnameinfo((catch ensure_sockaddr(SockAddr)), Flags);
+    nif_getnameinfo(socket:ensure_sockaddr(SockAddr), Flags);
 getnameinfo(#{family := Fam, path := _Path} = SockAddr, Flags)
   when (Fam =:= local) andalso (is_list(Flags) orelse (Flags =:= undefined)) ->
     nif_getnameinfo(SockAddr, Flags).
 
 
-%% This function is intended to "handle" the case when the user
-%% has built their (OTP) system with "--disable-esock".
-%% That means the socket module does not exist. This is not really
-%% a problem since the nif_getnameinfo won't work either (since
-%% the nif file is not part of the system). The result of calling
-%% getnameinfo will be a undef exception (erlang:nif_error(undef)).
-%%
-%% The only functions in this module that actually work in this case
-%% (--disable-esock) is the depricated stuff (call, cast, ...).
-%%
-ensure_sockaddr(SockAddr) ->
-    try socket:ensure_sockaddr(SockAddr)
-    catch
-        error:undef:_ ->
-            undefined
-    end.
-
 %% ===========================================================================
 %%
 %% getaddrinfo - Network address and service translation
 %%
 %% There is also a "hint" argument that we "at some point" should implement.
 
--spec getaddrinfo(Host) -> {ok, Info} | {error, Reason} when
-      Host    :: string(),
-      Info    :: [address_info()],
-      Reason  :: term().
-
-getaddrinfo(Host) when is_list(Host) ->
-    getaddrinfo(Host, undefined).
-
-
 -spec getaddrinfo(Host, undefined) -> {ok, Info} | {error, Reason} when
       Host    :: string(),
       Info    :: [address_info()],