File 0729-os_mon-Fix-failing-port_close.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0729-os_mon-Fix-failing-port_close.patch of Package erlang (Revision f4c798e4a89b3576e3438788d38e337f)

Currently displaying revision f4c798e4a89b3576e3438788d38e337f , Show latest

From 2b2034cd070afccfaccf4ff8b3a9050eb090290e Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Fri, 21 Apr 2023 19:27:01 +0200
Subject: [PATCH] os_mon: Fix failing port_close

Use asynchtonous close message to not fail on already closed port.
---
 lib/os_mon/src/cpu_sup.erl | 4 ++--
 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 be917021e7..adf1f45265 100644
--- a/lib/os_mon/src/cpu_sup.erl
+++ b/lib/os_mon/src/cpu_sup.erl
@@ -613,8 +613,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
-- 
2.35.3

Places

File 0729-os_mon-Fix-failing-port_close.patch of Package erlang (Revision f4c798e4a89b3576e3438788d38e337f)

Places