Merge branch 'lukas/erts/forker'

* lukas/erts/forker: (28 commits)
  erts: Never abort in the forked child
  erts: Mend ASSERT makro for erl_child_setup
  erts: Allow enomem failures in port_SUITE
  erts: iter_port sleep longer on freebsd
  erts: Allow one dangling fd if there is a gethost port
  erts: Only use forker StackAck on freebsd
  erts: It is not possible to exit the forker driver
  erts: Add forker StartAck for port start flowcontrol
  erts: Fix large open_port arg segfault for win32
  erts: Fix memory leak at async open port
  kernel: Remove cmd server for unix os:cmd
  erts: Add testcase for huge port environment
  erts: Move os_pid to port hash to child setup
  erts: Handle all EINTR and EAGAIN cases in child setup
  erts: Make child_setup work with large environments
  erts: Fix forker driver ifdefs for win32
  erts: Fix uds socket handling for os x
  erts: Fix dereferencing of unaligned integer for sparc
  erts: Flatten too long io vectors in uds write
  erts: Add fd count test for spawn_driver
  ...

Conflicts:
	erts/emulator/beam/erl_node_tables.c
	erts/preloaded/src/erts_internal.erl

2 files changed, 16 insertions, 3 deletions

diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 8ebb92d5b2..9517acd78e 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2034,8 +2034,14 @@ nodes(_Arg) ->
            | eof
 	   | {parallelism, Boolean :: boolean()}
 	   | hide.
-open_port(_PortName,_PortSettings) ->
-    erlang:nif_error(undefined).
+open_port(PortName, PortSettings) ->
+    case case erts_internal:open_port(PortName, PortSettings) of
+	     Ref when erlang:is_reference(Ref) -> receive {Ref, Res} -> Res end;
+	     Res -> Res
+	 end of
+	Port when erlang:is_port(Port) -> Port;
+	Error -> erlang:error(Error, [PortName, PortSettings])
+    end.
 
 -type priority_level() ::
       low | normal | high | max.
diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl
index ce0a6a1d9e..426749264f 100644
--- a/erts/preloaded/src/erts_internal.erl
+++ b/erts/preloaded/src/erts_internal.erl
@@ -32,7 +32,7 @@
 -export([await_port_send_result/3]).
 -export([cmp_term/2]).
 -export([map_to_tuple_keys/1, term_type/1, map_hashmap_children/1]).
--export([port_command/3, port_connect/2, port_close/1,
+-export([open_port/2, port_command/3, port_connect/2, port_close/1,
 	 port_control/3, port_call/3, port_info/1, port_info/2]).
 
 -export([request_system_task/3]).
@@ -88,6 +88,13 @@ gather_io_bytes(Ref, No, InAcc, OutAcc) ->
 %% Statically linked port NIFs
 %%
 
+-spec erts_internal:open_port(PortName, PortSettings) -> Result when
+      PortName :: tuple(),
+      PortSettings :: term(),
+      Result :: port() | reference() | atom().
+open_port(_PortName, _PortSettings) ->
+    erlang:nif_error(undefined).
+
 -spec erts_internal:port_command(Port, Data, OptionList) -> Result when
       Port :: port() | atom(),
       Data :: iodata(),