aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2019-07-08 16:41:28 +0200
committerMicael Karlberg <[email protected]>2019-07-08 16:41:28 +0200
commit1e2343e748ba212536a568a5d40357d75ccb6b7a (patch)
tree17d7e6702b4bd39887d4c78a4fcfbf09e73d312d /erts/doc/src
parentf8bd1d27e86b338693b72fd1bd6938876660dfcf (diff)
parenta492dd84c72ca8bad5e9a52e658c9448643a9cfe (diff)
downloadotp-1e2343e748ba212536a568a5d40357d75ccb6b7a.tar.gz
otp-1e2343e748ba212536a568a5d40357d75ccb6b7a.tar.bz2
otp-1e2343e748ba212536a568a5d40357d75ccb6b7a.zip
Merge branch 'bmk/erts/esock/20190626/finalize_counters/OTP-15818' into maint
Diffstat (limited to 'erts/doc/src')
-rw-r--r--erts/doc/src/socket.xml23
1 files changed, 23 insertions, 0 deletions
diff --git a/erts/doc/src/socket.xml b/erts/doc/src/socket.xml
index b4e22e86a8..da049b1a7f 100644
--- a/erts/doc/src/socket.xml
+++ b/erts/doc/src/socket.xml
@@ -112,6 +112,15 @@
<name name="select_info"/>
</datatype>
<datatype>
+ <name name="socket_counters"/>
+ </datatype>
+ <datatype>
+ <name name="socket_counter"/>
+ </datatype>
+ <datatype>
+ <name name="socket_info"/>
+ </datatype>
+ <datatype>
<name name="ip4_address"/>
</datatype>
<datatype>
@@ -456,6 +465,20 @@
</func>
<func>
+ <name name="info" arity="1" since="OTP @OTP-15818@"/>
+ <fsummary>Get miscellaneous socket info.</fsummary>
+ <desc>
+ <p>Get miscellaneous info about the socket.</p>
+ <p>The function returns a map with each info item as a key-value
+ binding. It reflects the "current" state of the socket. </p>
+ <note>
+ <p>In order to ensure data integrity, mutex'es are taken when
+ needed. So, do not call this function often. </p>
+ </note>
+ </desc>
+ </func>
+
+ <func>
<name name="listen" arity="1" since="OTP 22.0"/>
<name name="listen" arity="2" since="OTP 22.0"/>
<fsummary>Listen for connections on a socket.</fsummary>