File 0249-esock-Monitoring-a-closed-socket-should-re... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0249-esock-Monitoring-a-closed-socket-should-result-in-a-.patch of Package erlang (Revision b86624bd0b247ddee296914ae2ffe962)

Currently displaying revision b86624bd0b247ddee296914ae2ffe962 , Show latest

From 94fbb38a321400d5b4f17b3781745c6d949b3b35 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 25 Nov 2021 17:25:45 +0100
Subject: [PATCH 1/2] [esock] Monitoring a closed socket should result in a
 DOWN

OTP-17806
---
 lib/kernel/src/socket.erl | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/lib/kernel/src/socket.erl b/lib/kernel/src/socket.erl
index 6f348a170c..c188f516a1 100644
--- a/lib/kernel/src/socket.erl
+++ b/lib/kernel/src/socket.erl
@@ -1232,22 +1232,14 @@ info(Socket) ->
 -spec monitor(Socket) -> reference() when
       Socket :: socket().
 
-%% Should it be possible to specify a modification of the 'Socket' part
-%% of the DOWN-message? The point would be to make it possible for
-%% a gen_tcp_socket-socket to use this and get the proper 'socket'
-%% as part of the message.
-
 monitor(?socket(SockRef) = Socket) when is_reference(SockRef) ->
     case prim_socket:setopt(SockRef, {otp, use_registry}, true) of
         ok ->
-            case socket_registry:monitor(Socket) of
-		{error, MReason} ->
-		    erlang:error({invalid, MReason});
-		MRef when is_reference(MRef) ->
-		    MRef
-	    end;
-        {error, SReason} ->
-	    erlang:error({invalid, SReason})
+            socket_registry:monitor(Socket);
+        {error, closed = SReason} ->
+            MRef = make_ref(),
+            self() ! {'DOWN', MRef, socket, Socket, SReason},
+	    MRef
     end;
 monitor(Socket) ->
     erlang:error(badarg, [Socket]).
-- 
2.31.1

Places

File 0249-esock-Monitoring-a-closed-socket-should-result-in-a-.patch of Package erlang (Revision b86624bd0b247ddee296914ae2ffe962)

Places