From 00668f8cbae565d482e9ad72a63f846cef8e8071 Mon Sep 17 00:00:00 2001
From: Patrik Nyblom <pan@erlang.org>
Date: Wed, 18 Apr 2012 11:31:27 +0200
Subject: Revert "Extend erlang:port_info/1,2 to show the OS pid of a spawned
 process"

This reverts commit d4667d383964c1550e0a91d64b674e84f6d07e3b.

This commit was included by mistake, the correct patch will
be merged from maint.
---
 erts/emulator/beam/atom.names     |  1 -
 erts/emulator/beam/erl_bif_info.c | 16 +---------------
 erts/emulator/beam/global.h       |  1 -
 erts/emulator/beam/io.c           |  1 -
 4 files changed, 1 insertion(+), 18 deletions(-)

(limited to 'erts/emulator/beam')

diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index 78c566ed38..02735d4b68 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -391,7 +391,6 @@ 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 4dcfe997d4..060a52d220 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -2765,8 +2765,7 @@ port_info_1(BIF_ALIST_1)
 	am_id,
 	am_connected,
 	am_input,
-	am_output,
-	am_os_pid
+	am_output
     };
     Eterm items[ASIZE(keys)];
     Eterm result = NIL;
@@ -2823,7 +2822,6 @@ 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)
@@ -2924,18 +2922,6 @@ 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;
-            Uint n = prt->os_pid;
-            (void) erts_bld_uint(NULL, &hsz, n);
-            hp = HAlloc(p, hsz);
-            res = erts_bld_uint(&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 732cc7d45d..84267dd140 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -174,7 +174,6 @@ struct port {
     char *name;		         /* String used in the open */
     erts_driver_t* drv_ptr;
     UWord drv_data;
-    pid_t 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 a685f41c4d..53a25f5136 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -440,7 +440,6 @@ 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;
-- 
cgit v1.2.3