Make timing out operations (ezmq:term/2 and ezmq:recv/2) return call …

…reference as well
zeromq · Mar 4, 2011 · 8e645a2 · 8e645a2
1 parent 172e311
commit 8e645a2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/include/ezmq.hrl b/include/ezmq.hrl
@@ -51,7 +51,7 @@
 -type ezmq_error_type() :: enotsup | eprotonosupport | enobufs | enetdown | eaddrinuse | eaddnotavail | econnrefused | 
                            einprogress | efsm | enocompatproto | eterm | emthread | errno() | {unknown, integer()}.
 
--type ezmq_error() :: {error, ezmq_error_type()}.
+-type ezmq_error() :: {error, ezmq_error_type()} | {error, timeout(), reference()}.
 
 -type ezmq_data() :: iolist().
 

diff --git a/src/ezmq.erl b/src/ezmq.erl
@@ -63,7 +63,7 @@ recv(Socket, Flags) when is_list(Flags) ->
                 {Ref, Result} ->
                     {ok, Result}
             after Timeout ->
-                    {error, timeout}
+                    {error, timeout, Ref}
             end;
         Result ->
             ezmq_result(Result)
@@ -98,7 +98,7 @@ term(Context, Timeout) ->
                 {Ref, Result} ->
                     Result
             after Timeout ->
-                    {error, timeout}
+                    {error, timeout, Ref}
             end;
         Result ->
             ezmq_result(Result)

diff --git a/test/ezmq_test.erl b/test/ezmq_test.erl
@@ -69,15 +69,17 @@ shutdown_no_blocking_test() ->
 shutdown_blocking_test() ->
     {ok, C} = ezmq:context(),
     {ok, _S} = ezmq:socket(C, pub),
-    ?assertEqual({error, timeout}, ezmq:term(C, 500)).
+    ?assertMatch({error, timeout, _}, ezmq:term(C, 500)).
 
 shutdown_blocking_unblocking_test() ->
     {ok, C} = ezmq:context(),
     {ok, S} = ezmq:socket(C, pub),
-    ?assertEqual({error, timeout}, ezmq:term(C, 500)),
+    V = ezmq:term(C, 500),
+    ?assertMatch({error, timeout, _}, V),
+    {error, timeout, Ref} = V,
     ezmq:close(S),
     receive 
-        {R, ok} when is_reference(R) ->
+        {Ref, ok} ->
             ok
     end.