diff options
| author | Sverker Eriksson <sverker@erlang.org> | 2023-05-04 16:59:28 +0200 |
|---|---|---|
| committer | Sverker Eriksson <sverker@erlang.org> | 2023-05-04 16:59:28 +0200 |
| commit | 2e5df6e84f3622a269f1dfbc2b80eb5e6543539e (patch) | |
| tree | 880be3dd10003245d9c0b37e7914c87d947cb1e2 | |
| parent | 7f6dfbbf820179500f17478b8ef0d4dfd9947f46 (diff) | |
| parent | 7a54fbf000d414c5d3b69ee524f9ecb2d57db6d1 (diff) | |
| download | erlang-2e5df6e84f3622a269f1dfbc2b80eb5e6543539e.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lib/os_mon/src/cpu_sup.erl | 4 | ||||
| -rw-r--r-- | lib/os_mon/src/memsup.erl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/os_mon/src/cpu_sup.erl b/lib/os_mon/src/cpu_sup.erl index 522ffe5830..a82dfd9961 100644 --- a/lib/os_mon/src/cpu_sup.erl +++ b/lib/os_mon/src/cpu_sup.erl @@ -614,8 +614,8 @@ port_server_loop(Port, Timeout) -> % Close port and this server {Pid, ?quit} -> - port_command(Port, ?quit), - port_close(Port), + Port ! {self(), {command, ?quit}}, + Port ! {self(), close}, Pid ! {self(), {data, quit}}, ok; diff --git a/lib/os_mon/src/memsup.erl b/lib/os_mon/src/memsup.erl index 1c93bfbae4..c467adc2e5 100644 --- a/lib/os_mon/src/memsup.erl +++ b/lib/os_mon/src/memsup.erl @@ -653,7 +653,7 @@ start_portprogram() -> port_shutdown(Port) -> Port ! {self(), {command, [?EXIT]}}, - port_close(Port). + Port ! {self(), close}. %% The connected process loops are a bit awkward (several different %% functions doing almost the same thing) as |