From 4a69f68e9f0ffd76f1338851f8c19614b5d7fc14 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 30 Jul 2019 16:41:00 +0200
Subject: [esock] Updated select-info

---
 erts/preloaded/ebin/socket.beam | Bin 76028 -> 75892 bytes
 erts/preloaded/src/socket.erl   |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/erts/preloaded/ebin/socket.beam b/erts/preloaded/ebin/socket.beam
index eafd7a97b2..73a0bd4f72 100644
Binary files a/erts/preloaded/ebin/socket.beam and b/erts/preloaded/ebin/socket.beam differ
diff --git a/erts/preloaded/src/socket.erl b/erts/preloaded/src/socket.erl
index e01c85d5d1..07e720c44d 100644
--- a/erts/preloaded/src/socket.erl
+++ b/erts/preloaded/src/socket.erl
@@ -627,11 +627,11 @@
 -opaque select_tag() :: atom().
 -opaque select_ref() :: reference().
 
--record(select_info, {tag :: select_tag(), ref :: select_ref()}).
+%% -record(select_info, {tag :: select_tag(), ref :: select_ref()}).
 
--type select_info() :: #select_info{}.
+-type select_info() :: {select_info, select_tag(), select_ref()}.
 
--define(SELECT_INFO(T, R), #select_info{tag = T, ref = R}).
+-define(SELECT_INFO(T, R), {select_info, T, R}).
 -define(SELECT(T, R),      {select, ?SELECT_INFO(T, R)}).
 
 
@@ -2685,7 +2685,7 @@ peername(#socket{ref = SockRef}) ->
       SelectInfo :: select_info(),
       Reason     :: term().
 
-cancel(#socket{ref = SockRef}, #select_info{tag = Tag, ref = Ref}) ->
+cancel(#socket{ref = SockRef}, ?SELECT_INFO(Tag, Ref)) ->
     cancel(SockRef, Tag, Ref).
 
 
-- 
cgit v1.2.3


From 5160aa7f66dff4f9beb3a57eb9b1f3dc3b408617 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 30 Jul 2019 16:41:33 +0200
Subject: [esock|doc] Updated select-info

---
 erts/doc/src/socket_usage.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/erts/doc/src/socket_usage.xml b/erts/doc/src/socket_usage.xml
index dd54e51813..c3cda9a615 100644
--- a/erts/doc/src/socket_usage.xml
+++ b/erts/doc/src/socket_usage.xml
@@ -70,11 +70,6 @@
       <p>The caller can then make another
       call to the recv function and now expect data.</p>
       <p>The user must also be prepared to receive an abort message: </p>
-      <!--
-      <list type="ordered">
-	<item><c>{'$socket', Sock, abort, Info}</c></item>
-      </list>
-      -->
       <taglist>
 	<!-- NOTE THAT THE EMPTY TAG IS INTENTIONAL -->
 	<tag></tag>
-- 
cgit v1.2.3