Merge branch 'pg/r15/add-os-pid-to-port-info' into maint

* pg/r15/add-os-pid-to-port-info:
  tests: Remove line macro from port_bif_SUITE
  Correct documentation, erl_bif_types and dialyzer tests
  Make port_info(Port,os_pid) work on Windows
  Extend erlang:port_info/1,2 to show the OS pid of a spawned process

OTP-10057

12 files changed, 254 insertions, 195 deletions

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 0963904b83..cfc7fff3af 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -3573,6 +3573,10 @@ os_prompt% </pre>
             <p><c>Bytes</c> is the total number of bytes written to
               the port.</p>
           </item>
+          <tag><c>{os_pid, Integer | undefined}</c></tag>
+          <item>
+            <p><c>Integer</c> is the process identifier (or equivalent) of an OS process created with <c>open_port({spawn | spawn_executable, Command}, Options)</c>. If the port is not the result of spawning an OS process, the value is <c>undefined</c>.</p>
+          </item>
         </taglist>
         <p>Failure: <c>badarg</c> if <c>Port</c> is not a local port.</p>
       </desc>
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index 02735d4b68..78c566ed38 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -391,6 +391,7 @@ atom opt
 atom or
 atom ordered_set
 atom orelse
+atom os_pid
 atom os_type
 atom os_version
 atom ose_bg_proc
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 060a52d220..2373dc7af4 100644..100755
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -2765,7 +2765,8 @@ port_info_1(BIF_ALIST_1)
 	am_id,
 	am_connected,
 	am_input,
-	am_output
+	am_output,
+	am_os_pid
     };
     Eterm items[ASIZE(keys)];
     Eterm result = NIL;
@@ -2822,6 +2823,7 @@ port_info_1(BIF_ALIST_1)
 **    name        String
 **    input       Number of bytes input from port program
 **    output      Number of bytes output to the port program
+**    os_pid      The child's process ID
 */
 
 BIF_RETTYPE port_info_2(BIF_ALIST_2)
@@ -2922,6 +2924,18 @@ static BIF_RETTYPE port_info(Process* p, Eterm portid, Eterm item)
 	hp = HAlloc(p, hsz);
 	res = erts_bld_uint(&hp, NULL, n);
     }
+    else if (item == am_os_pid) {
+        if (prt->os_pid >= 0) {
+            Uint hsz = 3;
+            UWord n = prt->os_pid;
+            (void) erts_bld_uword(NULL, &hsz, n);
+            hp = HAlloc(p, hsz);
+            res = erts_bld_uword(&hp, NULL, n);
+        } else {
+	    hp = HAlloc(p, 3);
+	    res = am_undefined;
+        }
+    }
     else if (item == am_registered_name) {
 	RegProc *reg;
 	reg = prt->reg;
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index fc4c0ba121..894872dbc0 100644..100755
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -173,6 +173,7 @@ struct port {
     char *name;		         /* String used in the open */
     erts_driver_t* drv_ptr;
     UWord drv_data;
+    SWord os_pid;                 /* Child process ID */
     ErtsProcList *suspended;	 /* List of suspended processes. */
     LineBuf *linebuf;            /* Buffer to hold data not ready for
 				    process to get (line oriented I/O)*/
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index 53a25f5136..a685f41c4d 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -440,6 +440,7 @@ setup_port(Port* prt, Eterm pid, erts_driver_t *driver,
     sys_strcpy(new_name, name);
     erts_smp_runq_lock(runq);
     erts_smp_port_state_lock(prt);    
+    prt->os_pid = -1;
     prt->status = ERTS_PORT_SFLG_CONNECTED | xstatus;
     prt->snapshot = erts_smp_atomic32_read_nob(&erts_ports_snapshot);    
     old_name = prt->name;
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index f94e0f2296..bf69f3bf90 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -1163,6 +1163,8 @@ static int set_driver_data(int port_num,
 	report_exit_list = report_exit;
     }
 
+    erts_port[port_num].os_pid = pid;
+
     if (read_write & DO_READ) {
 	driver_data[ifd].packet_bytes = packet_bytes;
 	driver_data[ifd].port_num = port_num;
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index b106f0932d..acbbfc2ce9 100755
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c
@@ -68,9 +68,9 @@ static int async_write_file(struct async_io* aio, LPVOID buf, DWORD numToWrite);
 static int get_overlapped_result(struct async_io* aio,
 				 LPDWORD pBytesRead, BOOL wait);
 static BOOL create_child_process(char *, HANDLE, HANDLE,
-			       HANDLE, LPHANDLE, BOOL,
-			       LPVOID, LPTSTR, unsigned,
-			       char **, int *);
+				 HANDLE, LPHANDLE, LPDWORD, BOOL,
+				 LPVOID, LPTSTR, unsigned,
+				 char **, int *);
 static int create_pipe(LPHANDLE, LPHANDLE, BOOL, BOOL);
 static int application_type(const char* originalName, char fullPath[MAX_PATH],
 			   BOOL search_in_path, BOOL handle_quotes,
@@ -1136,6 +1136,7 @@ spawn_start(ErlDrvPort port_num, char* name, SysDriverOpts* opts)
     HANDLE hChildStdin = INVALID_HANDLE_VALUE;		/* Child's stdin. */
     HANDLE hChildStdout = INVALID_HANDLE_VALUE;	/* Child's stout. */
     HANDLE hChildStderr = INVALID_HANDLE_VALUE;	/* Child's sterr. */
+    DWORD pid;
     int close_child_stderr = 0;
     DriverData* dp;		/* Pointer to driver data. */
     ErlDrvData retval = ERL_DRV_ERROR_GENERAL; /* Return value. */
@@ -1211,6 +1212,7 @@ spawn_start(ErlDrvPort port_num, char* name, SysDriverOpts* opts)
 			    hChildStdout,
 			    hChildStderr,
 			    &dp->port_pid,
+			    &pid,
 			    opts->hide_window,
 			    (LPVOID) envir,
 			    (LPTSTR) opts->wd,
@@ -1254,6 +1256,9 @@ spawn_start(ErlDrvPort port_num, char* name, SysDriverOpts* opts)
 #endif
 	retval = set_driver_data(dp, hFromChild, hToChild, opts->read_write,
 				 opts->exit_status);
+	if (retval != ERL_DRV_ERROR_GENERAL && retval != ERL_DRV_ERROR_ERRNO)
+	    /* We assume that this cannot generate a negative number */
+	    erts_port[port_num].os_pid = (SWord) pid;
     }
     
     if (retval != ERL_DRV_ERROR_GENERAL && retval != ERL_DRV_ERROR_ERRNO)
@@ -1397,7 +1402,8 @@ create_child_process
  HANDLE hStdin,  /* The standard input handle for child. */
  HANDLE hStdout, /* The standard output handle for child. */ 
  HANDLE hStderr, /* The standard error handle for child. */
- LPHANDLE phPid, /* Pointer to variable to received PID. */
+ LPHANDLE phPid, /* Pointer to variable to received Process handle. */
+ LPDWORD pdwID,   /* Pointer to variable to received Process ID */
  BOOL hide,      /* Hide the window unconditionally. */
  LPVOID env,     /* Environment for the child */
  LPTSTR wd,      /* Working dir for the child */
@@ -1629,7 +1635,8 @@ create_child_process
     }
     CloseHandle(piProcInfo.hThread); /* Necessary to avoid resource leak. */
     *phPid = piProcInfo.hProcess;
-    
+    *pdwID = piProcInfo.dwProcessId;
+
     if (applType == APPL_DOS) {
 	WaitForSingleObject(hProcess, 50);
     }
diff --git a/erts/emulator/test/port_bif_SUITE.erl b/erts/emulator/test/port_bif_SUITE.erl
index d9c82aba0e..8feea87d7e 100644
--- a/erts/emulator/test/port_bif_SUITE.erl
+++ b/erts/emulator/test/port_bif_SUITE.erl
@@ -24,6 +24,7 @@
 	 init_per_group/2,end_per_group/2, command/1,
 	 command_e_1/1, command_e_2/1, command_e_3/1, command_e_4/1,
 	 port_info1/1, port_info2/1,
+	 port_info_os_pid/1,
 	 connect/1, control/1, echo_to_busy/1]).
 
 -export([do_command_e_1/1, do_command_e_2/1, do_command_e_4/1]).
@@ -41,7 +42,7 @@ all() ->
 groups() -> 
     [{command_e, [],
       [command_e_1, command_e_2, command_e_3, command_e_4]},
-     {port_info, [], [port_info1, port_info2]}].
+     {port_info, [], [port_info1, port_info2, port_info_os_pid]}].
 
 init_per_suite(Config) ->
     Config.
@@ -65,15 +66,15 @@ end_per_testcase(_Func, Config) when is_list(Config) ->
     test_server:timetrap_cancel(Dog).
 
 command(Config) when is_list(Config) ->
-    ?line load_control_drv(Config),
-
-    ?line P = open_port({spawn, control_drv}, []),
-    ?line do_command(P, "hello"),
-    ?line do_command(P, <<"hello">>),
-    ?line do_command(P, sub_bin(<<"1234kalle">>)),
-    ?line do_command(P, unaligned_sub_bin(<<"blurf">>)),
-    ?line do_command(P, ["bl"|unaligned_sub_bin(<<"urf">>)]),
-    ?line true = erlang:port_close(P),
+    load_control_drv(Config),
+
+    P = open_port({spawn, control_drv}, []),
+    do_command(P, "hello"),
+    do_command(P, <<"hello">>),
+    do_command(P, sub_bin(<<"1234kalle">>)),
+    do_command(P, unaligned_sub_bin(<<"blurf">>)),
+    do_command(P, ["bl"|unaligned_sub_bin(<<"urf">>)]),
+    true = erlang:port_close(P),
     ok.
 
 do_command(P, Data) ->
@@ -94,139 +95,163 @@ do_command(P, Data) ->
 
 %% port_command/2: badarg 1st arg
 command_e_1(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line Program = filename:join(DataDir, "port_test"),
+    DataDir = ?config(data_dir, Config),
+    Program = filename:join(DataDir, "port_test"),
 
     process_flag(trap_exit, true),
-    ?line _ = spawn_link(?MODULE, do_command_e_1, [Program]),
-    ?line receive
-	      {'EXIT', Pid, {badarg, _}} when is_pid(Pid) ->
-		  ok;
-	      Other ->
-		  ?line test_server:fail(Other)
-	  after 10000 ->
-		  ?line test_server:fail(timeout)
-	  end,
+    _ = spawn_link(?MODULE, do_command_e_1, [Program]),
+    receive
+        {'EXIT', Pid, {badarg, _}} when is_pid(Pid) ->
+            ok;
+        Other ->
+            test_server:fail(Other)
+    after 10000 ->
+            test_server:fail(timeout)
+    end,
     ok.
 
 do_command_e_1(Program) ->
-    ?line _ = open_port({spawn, Program}, []),
-    ?line erlang:port_command(apple, "plock"),
+    _ = open_port({spawn, Program}, []),
+    erlang:port_command(apple, "plock"),
     exit(survived).
 
 %% port_command/2: badarg 2nd arg
 command_e_2(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line Program = filename:join(DataDir, "port_test"),
+    DataDir = ?config(data_dir, Config),
+    Program = filename:join(DataDir, "port_test"),
 
     process_flag(trap_exit, true),
-    ?line _ = spawn_link(?MODULE, do_command_e_2, [Program]),
-    ?line receive
-	      {'EXIT', Pid, {badarg, _}} when is_pid(Pid) ->
-		  ok;
-	      Other ->
-		  ?line test_server:fail(Other)
-	  after 10000 ->
-		  ?line test_server:fail(timeout)
-	  end,
+    _ = spawn_link(?MODULE, do_command_e_2, [Program]),
+    receive
+        {'EXIT', Pid, {badarg, _}} when is_pid(Pid) ->
+            ok;
+        Other ->
+            test_server:fail(Other)
+    after 10000 ->
+            test_server:fail(timeout)
+    end,
     ok.
 
 do_command_e_2(Program) ->
-    ?line P = open_port({spawn, Program}, []),
-    ?line erlang:port_command(P, 1),
+    P = open_port({spawn, Program}, []),
+    erlang:port_command(P, 1),
     exit(survived).
 
 %% port_command/2: Posix signals trapped
 command_e_3(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line Program = filename:join(DataDir, "port_test"),
+    DataDir = ?config(data_dir, Config),
+    Program = filename:join(DataDir, "port_test"),
 
     process_flag(trap_exit, true),
-    ?line P = open_port({spawn, Program}, [{packet, 1}]),
-    ?line Data = lists:duplicate(257, $a),
-    ?line erlang:port_command(P, Data),
-    ?line receive
-	      {'EXIT', Port, einval} when is_port(Port) ->
-		  ok;
-	      Other ->
-		  test_server:fail(Other)
-	  after 10000 ->
-		  test_server:fail(timeout)
-	  end,
+    P = open_port({spawn, Program}, [{packet, 1}]),
+    Data = lists:duplicate(257, $a),
+    erlang:port_command(P, Data),
+    receive
+        {'EXIT', Port, einval} when is_port(Port) ->
+            ok;
+        Other ->
+            test_server:fail(Other)
+    after 10000 ->
+            test_server:fail(timeout)
+    end,
     ok.
 
 %% port_command/2: Posix exit signals not trapped
 command_e_4(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line Program = filename:join(DataDir, "port_test"),
+    DataDir = ?config(data_dir, Config),
+    Program = filename:join(DataDir, "port_test"),
 
     process_flag(trap_exit, true),
-    ?line _ = spawn_link(?MODULE, do_command_e_4, [Program]),
-    ?line receive
-	      {'EXIT', Pid, {einval, _}} when is_pid(Pid) ->
-		  ok;
-	      Other ->
-		  ?line test_server:fail(Other)
-	  after 10000 ->
-		  ?line test_server:fail(timeout)
-	  end,
+    _ = spawn_link(?MODULE, do_command_e_4, [Program]),
+    receive
+        {'EXIT', Pid, {einval, _}} when is_pid(Pid) ->
+            ok;
+        Other ->
+            test_server:fail(Other)
+    after 10000 ->
+            test_server:fail(timeout)
+    end,
     ok.
 
 do_command_e_4(Program) ->
-    ?line P = open_port({spawn, Program}, [{packet, 1}]),
-    ?line Data = lists:duplicate(257, $a),
-    ?line erlang:port_command(P, Data),
+    P = open_port({spawn, Program}, [{packet, 1}]),
+    Data = lists:duplicate(257, $a),
+    erlang:port_command(P, Data),
     exit(survived).
 
 
 %% Tests the port_info/1 BIF
 port_info1(Config) when is_list(Config) ->
-    ?line load_control_drv(Config),
+    load_control_drv(Config),
     Me=self(),
-    ?line P = open_port({spawn, control_drv}, []),
-    ?line A1 = erlang:port_info(P),
-    ?line false = lists:keysearch(registered_name, 1, A1),
-    ?line register(myport, P),
-    ?line A = erlang:port_info(P),
-    ?line {value,{registered_name,myport}}=
-	lists:keysearch(registered_name, 1, A),
-    ?line {value,{name,"control_drv"}}=lists:keysearch(name, 1, A),
-    ?line {value,{links,[Me]}}=lists:keysearch(links, 1, A),
-    ?line {value,{id,_IdNum}}=lists:keysearch(id, 1, A),
-    ?line {value,{connected,_}}=lists:keysearch(connected, 1, A),
-    ?line {value,{input,0}}=lists:keysearch(input, 1, A),
-    ?line {value,{output,0}}=lists:keysearch(output, 1, A),
-    ?line true=erlang:port_close(P),
+    P = open_port({spawn, control_drv}, []),
+    A1 = erlang:port_info(P),
+    false = lists:keysearch(registered_name, 1, A1),
+    register(myport, P),
+    A = erlang:port_info(P),
+    {value,{registered_name,myport}}= lists:keysearch(registered_name, 1, A),
+    {value,{name,"control_drv"}}=lists:keysearch(name, 1, A),
+    {value,{links,[Me]}}=lists:keysearch(links, 1, A),
+    {value,{id,_IdNum}}=lists:keysearch(id, 1, A),
+    {value,{connected,_}}=lists:keysearch(connected, 1, A),
+    {value,{input,0}}=lists:keysearch(input, 1, A),
+    {value,{output,0}}=lists:keysearch(output, 1, A),
+    {value,{os_pid,undefined}}=lists:keysearch(os_pid, 1, A),  % linked-in driver doesn't have a OS pid
+    true=erlang:port_close(P),
     ok.
 
 %% Tests erlang:port_info/2"
 port_info2(Config) when is_list(Config) ->
-    ?line load_control_drv(Config),
+    load_control_drv(Config),
 
-    ?line P = open_port({spawn,control_drv}, [binary]),
-    ?line [] = erlang:port_info(P, registered_name),
-    ?line register(myport, P),
-    ?line {registered_name, myport} = erlang:port_info(P, registered_name),
+    P = open_port({spawn,control_drv}, [binary]),
+    [] = erlang:port_info(P, registered_name),
+    register(myport, P),
+    {registered_name, myport} = erlang:port_info(P, registered_name),
 
-    ?line {name, "control_drv"}=erlang:port_info(P, name),
-    ?line {id, _IdNum} = erlang:port_info(P, id),
+    {name, "control_drv"}=erlang:port_info(P, name),
+    {id, _IdNum} = erlang:port_info(P, id),
     Me=self(),
-    ?line {links, [Me]} = erlang:port_info(P, links),
-    ?line {connected, Me} = erlang:port_info(P, connected),
-    ?line {input, 0}=erlang:port_info(P, input),
-    ?line {output,0}=erlang:port_info(P, output),
-
-    ?line erlang:port_control(P, $i, "abc"),
-    ?line receive
-	      {P,{data,<<"abc">>}} -> ok
-	  end,
-    ?line {input,3} = erlang:port_info(P, input),
-    ?line {output,0} = erlang:port_info(P, output),
-
-    ?line Bin = list_to_binary(lists:duplicate(2047, 42)),
-    ?line output_test(P, Bin, 3, 0),
+    {links, [Me]} = erlang:port_info(P, links),
+    {connected, Me} = erlang:port_info(P, connected),
+    {input, 0}=erlang:port_info(P, input),
+    {output,0}=erlang:port_info(P, output),
+    {os_pid, undefined}=erlang:port_info(P, os_pid),  % linked-in driver doesn't have a OS pid
+
+    erlang:port_control(P, $i, "abc"),
+    receive
+        {P,{data,<<"abc">>}} -> ok
+    end,
+    {input,3} = erlang:port_info(P, input),
+    {output,0} = erlang:port_info(P, output),
+
+    Bin = list_to_binary(lists:duplicate(2047, 42)),
+    output_test(P, Bin, 3, 0),
     
-    ?line true = erlang:port_close(P),
+    true = erlang:port_close(P),
+    ok.
+
+%% Tests the port_info/1,2 os_pid option BIF
+port_info_os_pid(Config) when is_list(Config) ->
+    case os:type() of
+	{unix,_} ->
+	    do_port_info_os_pid();
+	_ ->
+	    {skip,"Only on Unix."}
+    end.
+
+do_port_info_os_pid() ->
+    P = open_port({spawn, "echo $$"}, [eof]),
+    A = erlang:port_info(P),
+    {os_pid, InfoOSPid} = erlang:port_info(P, os_pid),
+    EchoPidStr = receive
+	    {P, {data, EchoPidStr0}} -> EchoPidStr0
+	    after 10000 -> test_server:fail(timeout)
+    end,
+    {ok, [EchoPid], []} = io_lib:fread("~u\n", EchoPidStr),
+    {value,{os_pid, InfoOSPid}}=lists:keysearch(os_pid, 1, A),
+    EchoPid = InfoOSPid,
+    true = erlang:port_close(P),
     ok.
 
 output_test(_, _, Input, Output) when Output > 16#1fffffff ->
@@ -237,7 +262,7 @@ output_test(P, Bin, Input0, Output0) ->
 	{P,{data,Bin}} -> ok;
 	Other ->
 	    io:format("~p", [Other]),
-	    ?line ?t:fail()
+	    ?t:fail()
     end,
     Input = Input0 + size(Bin),
     Output = Output0 + size(Bin),
@@ -254,109 +279,106 @@ output_test(P, Bin, Input0, Output0) ->
 
 %% Tests the port_connect/2 BIF.
 connect(Config) when is_list(Config) ->
-    ?line load_control_drv(Config),
+    load_control_drv(Config),
 
-    ?line P = open_port({spawn, control_drv}, []),
+    P = open_port({spawn, control_drv}, []),
     register(myport, P),
 
-    ?line true = erlang:port_connect(myport, self()),
+    true = erlang:port_connect(myport, self()),
 
     %% Connect the port to another process.
 
     Data = "hello, world",
     Parent = self(),
-    ?line Rec =
-	fun(Me) -> receive
-		       {P,{data,Data}} ->
-			   Parent ! connect_ok,
-			   Me(Me)
-		   end
-	end,
-    ?line RecPid = spawn_link(fun() -> Rec(Rec) end),
-    ?line true = erlang:port_connect(P, RecPid),
-    ?line unlink(P),
+    Rec = fun(Me) ->
+	    receive
+		{P,{data,Data}} ->
+		    Parent ! connect_ok,
+		    Me(Me)
+	    end
+    end,
+    RecPid = spawn_link(fun() -> Rec(Rec) end),
+    true = erlang:port_connect(P, RecPid),
+    unlink(P),
 
     %% Send a command to the port and make sure that the
     %% other process receives the echo.
 
-    ?line erlang:port_command(P, Data),
-    ?line receive
-	      connect_ok -> ok
-	  end,
+    erlang:port_command(P, Data),
+    receive
+        connect_ok -> ok
+    end,
 
     %% Tests some errors.
 
-    ?line {'EXIT',{badarg, _}}=(catch erlang:port_connect(self(), self())),
-    ?line {'EXIT',{badarg, _}}=(catch erlang:port_connect(self(), P)),
-    ?line {'EXIT',{badarg, _}}=(catch erlang:port_connect(P, P)),
-    ?line {'EXIT',{badarg, _}}=(catch erlang:port_connect(P, xxxx)),
-    ?line {'EXIT',{badarg, _}}=(catch erlang:port_connect(P, [])),
+    {'EXIT',{badarg, _}}=(catch erlang:port_connect(self(), self())),
+    {'EXIT',{badarg, _}}=(catch erlang:port_connect(self(), P)),
+    {'EXIT',{badarg, _}}=(catch erlang:port_connect(P, P)),
+    {'EXIT',{badarg, _}}=(catch erlang:port_connect(P, xxxx)),
+    {'EXIT',{badarg, _}}=(catch erlang:port_connect(P, [])),
 
-    ?line process_flag(trap_exit, true),
-    ?line exit(P, you_should_die),
-    ?line receive
-	      {'EXIT',RecPid,you_should_die} -> ok;
-	      Other -> ?line ?t:fail({bad_message,Other})
-	  end,
+    process_flag(trap_exit, true),
+    exit(P, you_should_die),
+    receive
+        {'EXIT',RecPid,you_should_die} -> ok;
+        Other -> ?line ?t:fail({bad_message,Other})
+    end,
 
     %% Done.
     ok.
 
 %% Tests port_control/3
 control(Config) when is_list(Config) ->
-    ?line load_control_drv(Config),
-    ?line P = open_port({spawn, control_drv}, []),
+    load_control_drv(Config),
+    P = open_port({spawn, control_drv}, []),
 
     %% Test invalid (out-of-range) arguments.
 
-    ?line {'EXIT', {badarg, _}} = (catch erlang:port_control(self(), 1, [])),
+    {'EXIT', {badarg, _}} = (catch erlang:port_control(self(), 1, [])),
 
-    ?line {'EXIT', {badarg, _}} = (catch erlang:port_control(P, -1, [])),
-    ?line {'EXIT', {badarg, _}} = (catch erlang:port_control(P, -34887348739733833, [])),
-    ?line {'EXIT', {badarg, _}} = (catch erlang:port_control(P, 16#100000000, [])),
-    ?line {'EXIT', {badarg, _}} = (catch erlang:port_control(P, a, [])),
-    ?line {'EXIT', {badarg, _}} = (catch erlang:port_control(P, 'e', dum)),
-    ?line {'EXIT', {badarg, _}} = (catch erlang:port_control(P, $e, dum)),
-    ?line {'EXIT', {badarg, _}} = (catch erlang:port_control(P, $e, fun(X) -> X end)),
-    ?line {'EXIT', {badarg, _}} = (catch erlang:port_control(P, $e,
-							     [fun(X) -> X end])),
-    ?line {'EXIT', {badarg, _}} = (catch erlang:port_control(P, $e,
-							     [1|fun(X) -> X end])),
+    {'EXIT', {badarg, _}} = (catch erlang:port_control(P, -1, [])),
+    {'EXIT', {badarg, _}} = (catch erlang:port_control(P, -34887348739733833, [])),
+    {'EXIT', {badarg, _}} = (catch erlang:port_control(P, 16#100000000, [])),
+    {'EXIT', {badarg, _}} = (catch erlang:port_control(P, a, [])),
+    {'EXIT', {badarg, _}} = (catch erlang:port_control(P, 'e', dum)),
+    {'EXIT', {badarg, _}} = (catch erlang:port_control(P, $e, dum)),
+    {'EXIT', {badarg, _}} = (catch erlang:port_control(P, $e, fun(X) -> X end)),
+    {'EXIT', {badarg, _}} = (catch erlang:port_control(P, $e, [fun(X) -> X end])),
+    {'EXIT', {badarg, _}} = (catch erlang:port_control(P, $e, [1|fun(X) -> X end])),
 
     %% Test errors detected by the driver.
 
-    ?line {'EXIT', {badarg, _}} = (catch erlang:port_control(P, 177, [])),
-    ?line {'EXIT', {badarg, _}} = (catch erlang:port_control(P, 155,
-							     random_packet(1024))),
+    {'EXIT', {badarg, _}} = (catch erlang:port_control(P, 177, [])),
+    {'EXIT', {badarg, _}} = (catch erlang:port_control(P, 155, random_packet(1024))),
 
     %% Test big op codes.
 
     register(myport, P),
-    ?line test_op(myport, 256),
-    ?line test_op(P, 256),
-    ?line test_op(P, 16#0033A837),
-    ?line test_op(P, 16#0ab37938),
-    ?line test_op(P, 16#eab37938),
-    ?line test_op(P, 16#ffffFFFF),
+    test_op(myport, 256),
+    test_op(P, 256),
+    test_op(P, 16#0033A837),
+    test_op(P, 16#0ab37938),
+    test_op(P, 16#eab37938),
+    test_op(P, 16#ffffFFFF),
 
     %% Test the echo function of the driver.
 
-    ?line echo(P, 0),
-    ?line echo(P, 1),
-    ?line echo(P, 10),
-    ?line echo(P, 13),
-    ?line echo(P, 63),
-    ?line echo(P, 64),
-    ?line echo(P, 65),
-    ?line echo(P, 127),
-    ?line echo(P, 1023),
-    ?line echo(P, 1024),
-    ?line echo(P, 11243),
-    ?line echo(P, 70000),
+    echo(P, 0),
+    echo(P, 1),
+    echo(P, 10),
+    echo(P, 13),
+    echo(P, 63),
+    echo(P, 64),
+    echo(P, 65),
+    echo(P, 127),
+    echo(P, 1023),
+    echo(P, 1024),
+    echo(P, 11243),
+    echo(P, 70000),
 
     %% Done.
 
-    ?line true=erlang:port_close(myport),
+    true = erlang:port_close(myport),
     ok.
 
 test_op(P, Op) ->
@@ -364,23 +386,23 @@ test_op(P, Op) ->
     <<Op:32>> = list_to_binary(R).
 
 echo_to_busy(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line load_control_drv(Config),
-    ?line P = open_port({spawn, control_drv}, []),
-    ?line erlang:port_control(P, $b, [1]),	% Set to busy.
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    load_control_drv(Config),
+    P = open_port({spawn, control_drv}, []),
+    erlang:port_control(P, $b, [1]),	% Set to busy.
     Self = self(),
-    ?line Echoer = spawn(fun() -> echoer(P, Self) end),
-    ?line receive after 500 -> ok end,
-    ?line erlang:port_control(P, $b, [0]),	% Set to not busy.
-    ?line receive 
-	      {Echoer, done} ->
-		  ok;
-	      {Echoer, Other} ->
-		  test_server:fail(Other);
-	      Other ->
-		  test_server:fail({unexpected_message, Other})
-	  end,
-    ?line test_server:timetrap_cancel(Dog),
+    Echoer = spawn(fun() -> echoer(P, Self) end),
+    receive after 500 -> ok end,
+    erlang:port_control(P, $b, [0]),	% Set to not busy.
+    receive
+        {Echoer, done} ->
+            ok;
+        {Echoer, Other} ->
+            test_server:fail(Other);
+        Other ->
+            test_server:fail({unexpected_message, Other})
+    end,
+    test_server:timetrap_cancel(Dog),
     ok.
 
 echoer(P, ReplyTo) ->
@@ -405,9 +427,9 @@ echo(P, Size) ->
     Packet = erlang:port_control(P, $e, [unaligned_sub_bin(Bin)]).
 
 load_control_drv(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line erl_ddll:start(),
-    ?line ok = load_driver(DataDir, "control_drv").
+    DataDir = ?config(data_dir, Config),
+    erl_ddll:start(),
+    ok = load_driver(DataDir, "control_drv").
 
 load_driver(Dir, Driver) ->
     case erl_ddll:load_driver(Dir, Driver) of
@@ -459,4 +481,3 @@ sub_bin(Bin) when is_binary(Bin) ->
     B.
 
 id(I) -> I.
-    
diff --git a/lib/dialyzer/test/small_SUITE_data/results/port_info_test b/lib/dialyzer/test/small_SUITE_data/results/port_info_test
index 9ee863f9eb..863a3d61df 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/port_info_test
+++ b/lib/dialyzer/test/small_SUITE_data/results/port_info_test
@@ -3,4 +3,5 @@ port_info_test.erl:10: The pattern {'connected', 42} can never match the type 'u
 port_info_test.erl:14: The pattern {'registered_name', "42"} can never match the type 'undefined' | {'registered_name',atom()}
 port_info_test.erl:19: The pattern {'output', 42} can never match the type 'undefined' | {'connected',pid()}
 port_info_test.erl:24: Guard test 'links' =:= Atom::'connected' can never succeed
-port_info_test.erl:28: The pattern {'gazonk', _} can never match the type 'undefined' | {'connected' | 'id' | 'input' | 'links' | 'name' | 'output' | 'registered_name',atom() | pid() | [pid() | char()] | integer()}
+port_info_test.erl:28: The pattern {'gazonk', _} can never match the type 'undefined' | {'connected' | 'id' | 'input' | 'links' | 'name' | 'os_pid' | 'output' | 'registered_name',atom() | pid() | [pid() | char()] | integer()}
+port_info_test.erl:32: The pattern {'os_pid', "42"} can never match the type 'undefined' | {'os_pid','undefined' | non_neg_integer()}
diff --git a/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl b/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl
index 2ee9a3a6e2..07f22256c9 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl
@@ -3,7 +3,7 @@
 %% and the quality of the warnings that Dialyzer spits out
 %%
 -module(port_info_test).
--export([t1/1, t2/1, t3/1, t4/1, t5/2, buggy/1]).
+-export([t1/1, t2/1, t3/1, t4/1, t5/2, t6/1, buggy/1]).
 
 %% The following errors are correctly caught, but the messages are a bit weird
 t1(X) when is_port(X) ->
@@ -28,6 +28,10 @@ t5(X, Atom) when is_port(X) ->
   {gazonk, _} = erlang:port_info(X, Atom);
 t5(_, _) -> ok.
 
+t6(X) when is_port(X) ->
+  {os_pid, "42"} = erlang:port_info(X, os_pid);
+t6(_) -> ok.
+
 %% The type system is not strong enough to catch the following errors
 buggy(X) when is_atom(X) ->
   {links, X} = erlang:port_info(foo, X).
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index 0c2e846010..5033cef8c5 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -1186,6 +1186,7 @@ type(erlang, port_info, 2, Xs) ->
 		     ['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]),
@@ -3789,7 +3790,7 @@ arg_types(erlang, port_info, 1) ->
 arg_types(erlang, port_info, 2) ->
   [t_sup(t_port(), t_atom()),
    t_atoms(['registered_name', 'id', 'connected',
-	    'links', 'name', 'input', 'output'])];
+	    'links', 'name', 'input', 'output', 'os_pid'])];
 arg_types(erlang, port_to_list, 1) ->
   [t_port()];
 arg_types(erlang, ports, 0) ->
diff --git a/otp_build b/otp_build
index 78e1b3277e..c6c73fedfa 100755
--- a/otp_build
+++ b/otp_build
@@ -1339,7 +1339,9 @@ case $TARGET in
 	if [ X"$OVERRIDE_TARGET" = X"" -a X"$1" != X"env_win32" -a X"$1" != X"env_msys32" -a X"$1" != X"env_msys64"  ];then
 	    echo "Building for windows, you should do the " \
 		"following first:" >&2
-	    echo 'eval `./otp_build env_msys64`' >&2
+	    echo 'eval `./otp_build env_win32`' >&2
+	    echo 'or' >&2
+	    echo 'eval `./otp_build env_win32 x64`' >&2
 	    echo 'please note that there are backticks (``) in' \
 		'the command'
 	    exit 1