rbczmq 1.7.3 → 1.7.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTFiODAyNWE1MjM4MGVlODE0YmIxMGQyYTIyOWM3ZDlkNTc0ZWVhMw==
+    OWI3ZDU3NzMwMTQ5NzEwYTY1MzkwYzA3NmQzYmY2YjE5YzI0NmM5MQ==
   data.tar.gz: !binary |-
-    MjIzNzk5NzE5YWNhMmY3M2U2ODRmNmFmNzYxZmM2YzM4ZDJiMzJlOQ==
+    ZTlhN2Q2NzM1NzYxZjNlMjEzOWM3ZTVkNmYyM2FiMmQzYzE2NzIyYQ==
 SHA512:
   metadata.gz: !binary |-
-    NzNhNjFiZjRmNjllZjQyNmVjZjYzNGFmNTE2OGIxOThhNzUyY2NjMzA2NmE3
-    OGM1YzY4OTRkYzZhNDZmNjE3MzBmMTM0OTk5NzI5NzdkOTczOWQ5NWI0NjU0
-    Y2Q1ZDFmNGNjZDViYTIwZmY0YThlYjEyMTQ5ZjBmMGFiMWQ5OGU=
+    MzEzNjBiMTI2YmI3MGZkYjcyNjkzY2I1ODA2YWRhYzRjZGQ2ZTUzMzNkNzk4
+    MmQzNWIxMTExOTkwNWU4NzI3ZjZkNmVlOTVjY2U0MDE4MWQzMTYxNDhjMmU4
+    NjIyODg0ZGMxMjdjZWRmZjExOWMyZTA2OTAyNDY5ZTcyMmJkMDk=
   data.tar.gz: !binary |-
-    ZDYxNTQ4MzgxNjhkY2I1OTg3ZTU2MTVkOTliZWQ1Yzg2YTZkNmIwMzU1NTlk
-    MmRkNGUyZGRiY2U4Zjk5NTRhZmU1N2U5ZWM3YTIyMzY5ODJmODUyY2FhMWU2
-    NTYwZWVlM2E2OTA3NzQ3MjU0YWZiNzMxYjI0ZThlMDY2ZTk5NDQ=
+    Mzg3MDk5M2E1MjIwOGU3Yjg2NjlkMWZlMGNmYjM2NDE2NWQ5MTM2N2RhM2Y1
+    NTJiMDNiMTUyNTk0ZGM2ODRmYjc0YTE0NTA1MmRhZGU2NDM3NzY2OTA0NDEx
+    MGYxNTk1OGE1N2VmYzJhODdjNGE4MTFjMzRhMjBlZmNhMWJlYjg=

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = Changelog
 
+== 1.7.4 (November 25, 2013)
+
+* 	Update ZMQ::Socket to support strings with null bytes in them (Matt Connolly)
+
 == 1.7.3 (November 11, 2013)
 
 * Add an array of poll items to ZMQ::Loop so that they are not garbage collected. #25

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    rbczmq (1.7.3)
+    rbczmq (1.7.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    json (1.8.0)
+    json (1.8.1)
     rake (10.1.0)
     rake-compiler (0.8.3)
       rake

data/ext/rbczmq/socket.c

@@ -346,6 +346,25 @@ static VALUE rb_czmq_socket_set_verbose(VALUE obj, VALUE level)
     return Qnil;
 }
 
+/*
+ * :nodoc:
+ *
+ * Based on czmq `s_send_string` to send a C string. We need to be able to support
+ * strings that contain null bytes, so we cannot use zstr_send as it is intended for
+ * null terminated C strings.
+ */
+static int rb_czmq_nogvl_zstr_send_internal(struct nogvl_send_args *args, int flags)
+{
+    errno = 0;
+    zmq_sock_wrapper *socket = args->socket;
+
+    zmq_msg_t message;
+    zmq_msg_init_size(&message, args->length);
+    memcpy(zmq_msg_data(&message), args->msg, args->length);
+    int rc = zmq_sendmsg(socket->socket, &message, flags);
+    return (rc == -1? -1: 0);
+}
+
 /*
  * :nodoc:
  *  Sends a raw string while the GIL is released.
@@ -355,8 +374,8 @@ static VALUE rb_czmq_nogvl_zstr_send(void *ptr)
 {
     struct nogvl_send_args *args = ptr;
     errno = 0;
-    zmq_sock_wrapper *socket = args->socket;
-    return (VALUE)zstr_send(socket->socket, "%s", args->msg);
+    int rc = rb_czmq_nogvl_zstr_send_internal(args, 0);
+    return (VALUE)rc;
 }
 
 /*
@@ -368,8 +387,8 @@ static VALUE rb_czmq_nogvl_zstr_sendm(void *ptr)
 {
     struct nogvl_send_args *args = ptr;
     errno = 0;
-    zmq_sock_wrapper *socket = args->socket;
-    return (VALUE)zstr_sendm(socket->socket, "%s", args->msg);
+    int rc = rb_czmq_nogvl_zstr_send_internal(args, ZMQ_SNDMORE);
+    return (VALUE)rc;
 }
 
 /*
@@ -394,9 +413,11 @@ static VALUE rb_czmq_socket_send(VALUE obj, VALUE msg)
     GetZmqSocket(obj);
     ZmqAssertSocketNotPending(sock, "can only send on a bound or connected socket!");
     ZmqSockGuardCrossThread(sock);
-    Check_Type(msg, T_STRING);
     args.socket = sock;
-    args.msg = StringValueCStr(msg);
+    StringValue(msg);
+    Check_Type(msg, T_STRING);
+    args.msg = RSTRING_PTR(msg);
+    args.length = RSTRING_LEN(msg);
     rc = (int)rb_thread_blocking_region(rb_czmq_nogvl_zstr_send, (void *)&args, RUBY_UBF_IO, 0);
     ZmqAssert(rc);
     if (sock->verbose)
@@ -427,9 +448,11 @@ static VALUE rb_czmq_socket_sendm(VALUE obj, VALUE msg)
     GetZmqSocket(obj);
     ZmqAssertSocketNotPending(sock, "can only send on a bound or connected socket!");
     ZmqSockGuardCrossThread(sock);
-    Check_Type(msg, T_STRING);
     args.socket = sock;
-    args.msg = StringValueCStr(msg);
+    StringValue(msg);
+    Check_Type(msg, T_STRING);
+    args.msg = RSTRING_PTR(msg);
+    args.length = RSTRING_LEN(msg);
     rc = (int)rb_thread_blocking_region(rb_czmq_nogvl_zstr_sendm, (void *)&args, RUBY_UBF_IO, 0);
     ZmqAssert(rc);
     if (sock->verbose)
@@ -447,7 +470,13 @@ static VALUE rb_czmq_nogvl_recv(void *ptr)
     struct nogvl_recv_args *args = ptr;
     errno = 0;
     zmq_sock_wrapper *socket = args->socket;
-    return (VALUE)zstr_recv(socket->socket);
+
+    // implement similar to zstr_recv, except that the copy to the string is done
+    // after we return with the GIL so that the ruby string object can be created
+    // from the zmq message buffer in a single copy.
+    assert (socket->socket);
+    int rc = zmq_recvmsg(socket->socket, &args->message, 0);
+    return (VALUE)rc;
 }
 
 /*
@@ -474,13 +503,21 @@ static VALUE rb_czmq_socket_recv(VALUE obj)
     ZmqAssertSocketNotPending(sock, "can only receive on a bound or connected socket!");
     ZmqSockGuardCrossThread(sock);
     args.socket = sock;
-    str = (char *)rb_thread_blocking_region(rb_czmq_nogvl_recv, (void *)&args, RUBY_UBF_IO, 0);
-    if (str == NULL) return result;
+    zmq_msg_init(&args.message);
+
+    int rc = (int)rb_thread_blocking_region(rb_czmq_nogvl_recv, (void *)&args, RUBY_UBF_IO, 0);
+    if (rc < 0) {
+        zmq_msg_close(&args.message);
+        return Qnil;
+    }
     ZmqAssertSysError();
     if (sock->verbose)
         zclock_log ("I: %s socket %p: recv \"%s\"", zsocket_type_str(sock->socket), sock->socket, str);
-    result = ZmqEncode(rb_str_new2(str));
-    free(str);
+
+    result = rb_str_new(zmq_msg_data(&args.message), zmq_msg_size(&args.message));
+    zmq_msg_close(&args.message);
+
+    result = ZmqEncode(result);
     return result;
 }
 
@@ -501,19 +538,29 @@ static VALUE rb_czmq_socket_recv(VALUE obj)
 static VALUE rb_czmq_socket_recv_nonblock(VALUE obj)
 {
     char *str = NULL;
+    struct nogvl_recv_args args;
     errno = 0;
     VALUE result = Qnil;
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
     ZmqAssertSocketNotPending(sock, "can only receive on a bound or connected socket!");
     ZmqSockGuardCrossThread(sock);
-    str = zstr_recv_nowait(sock->socket);
-    if (str == NULL) return result;
+
+    zmq_msg_init(&args.message);
+
+    int rc = zmq_recvmsg(sock->socket, &args.message, ZMQ_DONTWAIT);
+    if (rc < 0) {
+        zmq_msg_close(&args.message);
+        return Qnil;
+    }
     ZmqAssertSysError();
     if (sock->verbose)
-        zclock_log ("I: %s socket %p: recv_nonblock \"%s\"", zsocket_type_str(sock->socket), sock->socket, str);
-    result = ZmqEncode(rb_str_new2(str));
-    free(str);
+        zclock_log ("I: %s socket %p: recv \"%s\"", zsocket_type_str(sock->socket), sock->socket, str);
+
+    result = rb_str_new(zmq_msg_data(&args.message), zmq_msg_size(&args.message));
+    zmq_msg_close(&args.message);
+
+    result = ZmqEncode(result);
     return result;
 }
 

data/ext/rbczmq/socket.h

@@ -102,6 +102,7 @@ void rb_czmq_free_sock_gc(void *ptr);
 struct nogvl_send_args {
     zmq_sock_wrapper *socket;
     const char *msg;
+    long length;
     bool read;
 };
 
@@ -120,6 +121,7 @@ struct nogvl_send_message_args {
 
 struct nogvl_recv_args {
     zmq_sock_wrapper *socket;
+    zmq_msg_t message;
 };
 
 struct nogvl_socket_poll_args {

data/lib/zmq/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module ZMQ
-  VERSION = "1.7.3"
+  VERSION = "1.7.4"
 end

data/test/test_socket.rb

@@ -275,6 +275,19 @@ class TestZmqSocket < ZmqTestCase
   ensure
     ctx.destroy
   end
+
+  def test_send_receive_with_null_in_string
+    string = [1,0,1,2,3,4,5].pack('c*')
+    ctx = ZMQ::Context.new
+    rep = ctx.socket(:PAIR)
+    rep.bind("inproc://test.socket-send_receive")
+    req = ctx.socket(:PAIR)
+    req.connect("inproc://test.socket-send_receive")
+    assert req.send(string)
+    assert_equal string, rep.recv
+  ensure
+    ctx.destroy
+  end
   
   def test_verbose
     ctx = ZMQ::Context.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbczmq
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - Lourens Naudé
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler