Merge branch 'maint'

frazze-jobb · Oct 27, 2023 · 88bf10f · 88bf10f
2 parents 424f5c3 + 714f268
commit 88bf10f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/lib/kernel/doc/src/socket.xml b/lib/kernel/doc/src/socket.xml
@@ -239,7 +239,7 @@
       <name name="select_tag"/>
       <desc>
 	<p>
-          A tag that describes the (select) operation,
+          A tag that describes the (select) operation (= function name),
           contained in the returned
           <seetype marker="#select_info"><c>select_info()</c></seetype>.
         </p>
@@ -272,7 +272,8 @@
       <name name="completion_tag"/>
       <desc>
 	<p>
-          A tag that describes the ongoing (completion) operation,
+	  A tag that describes the ongoing (completion) operation
+	  (= function name),
           contained in the returned
           <seetype marker="#completion_info"><c>completion_info()</c></seetype>.
         </p>

diff --git a/lib/kernel/src/socket.erl b/lib/kernel/src/socket.erl
@@ -793,8 +793,21 @@
 %% Interface term formats
 %%
 
--opaque select_tag()     :: atom() | {atom(), ContData :: term()}.
--opaque completion_tag() :: atom(). % | {atom(), ContData :: term()}.
+-define(ASYNCH_DATA_TAG, (recv | recvfrom | recvmsg |
+                          send | sendto | sendmsg)).
+-define(ASYNCH_TAG,      ((accept | connect) | ?ASYNCH_DATA_TAG)).
+
+%% -type asynch_data_tag() :: send | sendto | sendmsg |
+%%                            recv | recvfrom | recvmsg |
+%%                            sendfile.
+%% -type asynch_tag()      :: connect | accept |
+%%                            asynch_data_tag().
+%% -type select_tag()      :: asynch_tag() |
+%%                            {asynch_data_tag(), ContData :: term()}.
+%% -type completion_tag()  :: asynch_tag().
+-type select_tag()      :: ?ASYNCH_TAG | sendfile | 
+                           {?ASYNCH_DATA_TAG | sendfile, ContData :: term()}.
+-type completion_tag()  :: ?ASYNCH_TAG.
 
 -type select_handle() :: reference().
 -type completion_handle() :: reference().