Changing the recv() back to a 2-tuple response

zeromq · Jun 10, 2011 · 6cf222c · 6cf222c
1 parent 0ec0347
commit 6cf222c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 34 deletions.
diff --git a/c_src/erlzmq_nif.c b/c_src/erlzmq_nif.c
@@ -539,9 +539,6 @@ NIF(erlzmq_nif_recv)
 {
   erlzmq_thread_request_t req;
   erlzmq_socket_t * socket;
-  ERL_NIF_TERM flags_list;
-  size_t value_len = sizeof(int64_t);
-  int64_t flag_value = 0;
 
   if (! enif_get_resource(env, argv[0], erlzmq_nif_resource_socket,
                           (void **) &socket)) {
@@ -609,26 +606,16 @@ NIF(erlzmq_nif_recv)
     }
   }
   else {
-    if(zmq_getsockopt(socket->socket_zmq, ZMQ_RCVMORE, &flag_value, &value_len)) {
-      return return_zmq_errno(env, zmq_errno());
-    }
     enif_mutex_unlock(socket->mutex);
 
-    // Should we send the multipart flag
-    if(flag_value == 1) {
-      flags_list = enif_make_list1(env, enif_make_atom(env, "rcvmore"));
-    } else {
-      flags_list = enif_make_list(env, 0);
-    }
-
     ErlNifBinary binary;
     enif_alloc_binary(zmq_msg_size(&msg), &binary);
     memcpy(binary.data, zmq_msg_data(&msg), zmq_msg_size(&msg));
 
     zmq_msg_close(&msg);
 
-    return enif_make_tuple3(env, enif_make_atom(env, "ok"),
+    return enif_make_tuple2(env, enif_make_atom(env, "ok"),
-                            enif_make_binary(env, &binary), flags_list);
+                            enif_make_binary(env, &binary));
   }
 }
 
@@ -773,8 +760,9 @@ static void * polling_thread(void * handle)
         enif_mutex_lock(r->data.recv.socket->mutex);
         if (zmq_recv(r->data.recv.socket->socket_zmq, &msg,
                      r->data.recv.flags) ||
+            (r->data.recv.socket->active == ERLZMQ_SOCKET_ACTIVE_ON && 
             zmq_getsockopt(r->data.recv.socket->socket_zmq, 
-                    ZMQ_RCVMORE, &flag_value, &value_len) )
+                    ZMQ_RCVMORE, &flag_value, &value_len)) )
         {
           enif_mutex_unlock(r->data.recv.socket->mutex);
           if (r->data.recv.socket->active == ERLZMQ_SOCKET_ACTIVE_ON) {
@@ -802,16 +790,17 @@ static void * polling_thread(void * handle)
         enif_alloc_binary(zmq_msg_size(&msg), &binary);
         memcpy(binary.data, zmq_msg_data(&msg), zmq_msg_size(&msg));
         zmq_msg_close(&msg);
-        ERL_NIF_TERM flags_list;
-
-        // Should we send the multipart flag
-        if(flag_value == 1) {
-          flags_list = enif_make_list1(r->data.recv.env, enif_make_atom(r->data.recv.env, "rcvmore"));
-        } else {
-          flags_list = enif_make_list(r->data.recv.env, 0);
-        }
 
         if (r->data.recv.socket->active == ERLZMQ_SOCKET_ACTIVE_ON) {
+          ERL_NIF_TERM flags_list;
+
+          // Should we send the multipart flag
+          if(flag_value == 1) {
+            flags_list = enif_make_list1(r->data.recv.env, enif_make_atom(r->data.recv.env, "rcvmore"));
+          } else {
+            flags_list = enif_make_list(r->data.recv.env, 0);
+          }
+
           enif_send(NULL, &r->data.recv.pid, r->data.recv.env,
             enif_make_tuple4(r->data.recv.env,
               enif_make_atom(r->data.recv.env, "zmq"),
@@ -827,10 +816,9 @@ static void * polling_thread(void * handle)
         }
         else {
           enif_send(NULL, &r->data.recv.pid, r->data.recv.env,
-            enif_make_tuple3(r->data.recv.env,
+            enif_make_tuple2(r->data.recv.env,
               enif_make_copy(r->data.recv.env, r->data.recv.ref),
-              enif_make_binary(r->data.recv.env, &binary),
+              enif_make_binary(r->data.recv.env, &binary)));
-              flags_list));
 
           enif_free_env(r->data.recv.env);
           enif_release_resource(r->data.recv.socket);

diff --git a/src/erlzmq.erl b/src/erlzmq.erl
@@ -190,8 +190,8 @@ recv({I, Socket}, Flags)
         Ref when is_reference(Ref) ->
             Timeout = proplists:get_value(timeout, Flags, infinity),
             receive
-                {Ref, Result, Flag} ->
+                {Ref, Result} ->
-                    {ok, Result, Flag}
+                    {ok, Result}
             after Timeout ->
                     {error, {timeout, Ref}}
             end;

diff --git a/test/erlzmq_test.erl b/test/erlzmq_test.erl
@@ -15,7 +15,7 @@ hwm_test() ->
 
     ok = hwm_loop(10, S2),
 
-    ?assertMatch({ok, <<"test">>, _Flags}, erlzmq:recv(S1)),
+    ?assertMatch({ok, <<"test">>}, erlzmq:recv(S1)),
     ?assertMatch(ok, erlzmq:send(S2, <<"test">>)),
     ok = erlzmq:close(S1),
     ok = erlzmq:close(S2),
@@ -173,13 +173,13 @@ ping_pong({S1, S2}, Msg, active) ->
 
 ping_pong({S1, S2}, Msg, passive) ->
     ok = erlzmq:send(S1, Msg),
-    ?assertMatch({ok, Msg, []}, erlzmq:recv(S2)),
+    ?assertMatch({ok, Msg}, erlzmq:recv(S2)),
     ok = erlzmq:send(S2, Msg),
-    ?assertMatch({ok, Msg, []}, erlzmq:recv(S1)),
+    ?assertMatch({ok, Msg}, erlzmq:recv(S1)),
     ok = erlzmq:send(S1, Msg, [sndmore]),
     ok = erlzmq:send(S1, Msg),
-    ?assertMatch({ok, Msg, [rcvmore]}, erlzmq:recv(S2)),
+    ?assertMatch({ok, Msg}, erlzmq:recv(S2)),
-    ?assertMatch({ok, Msg, []}, erlzmq:recv(S2)),
+    ?assertMatch({ok, Msg}, erlzmq:recv(S2)),
     ok.
 
 basic_tests(Transport, Type1, Type2, Mode) ->