diff options
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/atom.names | 1 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 16 | ||||
| -rw-r--r-- | erts/emulator/beam/global.h | 1 | ||||
| -rw-r--r-- | erts/emulator/beam/io.c | 1 | ||||
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 2 | ||||
| -rw-r--r-- | erts/emulator/test/port_bif_SUITE.erl | 28 |
6 files changed, 2 insertions, 47 deletions
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; diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index bf69f3bf90..f94e0f2296 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -1163,8 +1163,6 @@ 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/test/port_bif_SUITE.erl b/erts/emulator/test/port_bif_SUITE.erl index f4ba502be5..d9c82aba0e 100644 --- a/erts/emulator/test/port_bif_SUITE.erl +++ b/erts/emulator/test/port_bif_SUITE.erl @@ -24,7 +24,6 @@ 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]). @@ -42,7 +41,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_os_pid]}]. + {port_info, [], [port_info1, port_info2]}]. init_per_suite(Config) -> Config. @@ -197,7 +196,6 @@ port_info1(Config) when is_list(Config) -> ?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 {value,{os_pid,undefined}}=lists:keysearch(os_pid, 1, A), % linked-in driver doesn't have a OS pid ?line true=erlang:port_close(P), ok. @@ -217,7 +215,6 @@ port_info2(Config) when is_list(Config) -> ?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 {os_pid, undefined}=erlang:port_info(P, os_pid), % linked-in driver doesn't have a OS pid ?line erlang:port_control(P, $i, "abc"), ?line receive @@ -232,29 +229,6 @@ port_info2(Config) when is_list(Config) -> ?line 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() -> - ?line P = open_port({spawn, "echo $$"}, [eof]), - ?line A = erlang:port_info(P), - ?line {os_pid, InfoOSPid} = erlang:port_info(P, os_pid), - ?line EchoPidStr = receive - {P, {data, EchoPidStr0}} -> EchoPidStr0 - after 10000 -> ?line test_server:fail(timeout) - end, - ?line {ok, [EchoPid], []} = io_lib:fread("~u\n", EchoPidStr), - ?line {value,{os_pid, InfoOSPid}}=lists:keysearch(os_pid, 1, A), - ?line EchoPid = InfoOSPid, - ?line true = erlang:port_close(P), - ok. - output_test(_, _, Input, Output) when Output > 16#1fffffff -> io:format("~p bytes received\n", [Input]); output_test(P, Bin, Input0, Output0) -> |