[socket] Update accept to handle Timeout = nowait

Update function accept and its spec(s) to handle
the Timeout value of nowait.

2 files changed, 20 insertions, 6 deletions

diff --git a/erts/preloaded/ebin/socket.beam b/erts/preloaded/ebin/socket.beam
index c353f62b18..76ea46ea73 100644
--- a/erts/preloaded/ebin/socket.beam
+++ b/erts/preloaded/ebin/socket.beam
diff --git a/erts/preloaded/src/socket.erl b/erts/preloaded/src/socket.erl
index b2085b4b59..073a699b1a 100644
--- a/erts/preloaded/src/socket.erl
+++ b/erts/preloaded/src/socket.erl
@@ -1279,18 +1279,27 @@ listen(#socket{ref = SockRef}, Backlog)
 accept(Socket) ->
     accept(Socket, ?SOCKET_ACCEPT_TIMEOUT_DEFAULT).
 
--spec accept(LSocket, Timeout) -> {ok, Socket} | {error, Reason} when
-      LSocket :: socket(),
-      Timeout :: timeout(),
-      Socket  :: socket(),
-      Reason  :: term().
+-spec accept(LSocket, nowait) -> 
+                    {ok, Socket} |
+                    {ok, SelectInfo} |
+                    {error, Reason} when
+      LSocket    :: socket(),
+      Socket     :: socket(),
+      SelectInfo :: select_info(),
+      Reason     :: term()
+                 ; (LSocket, Timeout) -> {ok, Socket} | {error, Reason} when
+      LSocket    :: socket(),
+      Timeout    :: timeout(),
+      Socket     :: socket(),
+      Reason     :: term().
 
 %% Do we really need this optimization?
 accept(_, Timeout) when is_integer(Timeout) andalso (Timeout =< 0) ->
     {error, timeout};
 accept(#socket{ref = LSockRef}, Timeout)
   when is_integer(Timeout) orelse
-       (Timeout =:= infinity) ->
+       (Timeout =:= infinity)  orelse
+       (Timeout =:= nowait) ->
     do_accept(LSockRef, Timeout).
 
 do_accept(LSockRef, Timeout) ->
@@ -1301,6 +1310,11 @@ do_accept(LSockRef, Timeout) ->
             Socket = #socket{ref = SockRef},
             {ok, Socket};
 
+
+        {error, eagain} when (Timeout =:= nowait) ->
+            {ok, ?SELECT_INFO(accept, AccRef)};
+
+
         {error, eagain} ->
             %% Each call is non-blocking, but even then it takes
             %% *some* time, so just to be sure, recalculate before