rbczmq 0.6 → 0.7

data/ext/rbczmq/context.c

@@ -303,8 +303,6 @@ static VALUE rb_czmq_ctx_socket(VALUE obj, VALUE type)
     sock->state = ZMQ_SOCKET_PENDING;
     sock->endpoint = Qnil;
     sock->thread = rb_thread_current();
-    sock->recv_timeout = ZMQ_SOCKET_DEFAULT_TIMEOUT;
-    sock->send_timeout = ZMQ_SOCKET_DEFAULT_TIMEOUT;
     rb_obj_call_init(socket, 0, NULL);
     return socket;
 }

data/ext/rbczmq/rbczmq_ext.h

@@ -23,8 +23,15 @@
 #define ZmqAssertSysError() if (zmq_errno() != 0 && zmq_errno() != EAGAIN) ZmqRaiseSysError();
 #define ZmqAssert(rc) \
     if (rc == -1) { \
-        ZmqAssertSysError(); \
         if (rc == ENOMEM) rb_memerror(); \
+        switch (zmq_errno()) { \
+        case EMTHREAD: \
+            rb_raise(rb_eZmqError, "There are no I/O thread available to complete this operation. Please initialize the ZMQ context with at least one I/O thread eg. ZMQ::Context.new(1)"); \
+            break; \
+        default : \
+            ZmqAssertSysError(); \
+            break; \
+        } \
         return Qfalse; \
     }
 #define ZmqAssertObjOnAlloc(obj, wrapper) \

data/ext/rbczmq/socket.c

@@ -42,8 +42,6 @@ void rb_czmq_mark_sock(void *ptr)
             zclock_log ("I: %s socket %p, context %p: GC mark", zsocket_type_str(sock->socket), sock, sock->ctx);
         rb_gc_mark(sock->endpoint);
         rb_gc_mark(sock->thread);
-        rb_gc_mark(sock->recv_timeout);
-        rb_gc_mark(sock->send_timeout);
     }
 }
 
@@ -219,7 +217,7 @@ static VALUE rb_czmq_socket_bind(VALUE obj, VALUE endpoint)
     args.socket = sock;
     args.endpoint = StringValueCStr(endpoint);
     rc = (int)rb_thread_blocking_region(rb_czmq_nogvl_socket_bind, (void *)&args, RUBY_UBF_IO, 0);
-    if (rc == -1) ZmqRaiseSysError();
+    ZmqAssert(rc);
     if (sock->verbose)
         zclock_log ("I: %s socket %p: bound \"%s\"", zsocket_type_str(sock->socket), obj, StringValueCStr(endpoint));
     sock->state = ZMQ_SOCKET_BOUND;
@@ -303,6 +301,8 @@ try_writable:
         return (VALUE)zstr_send_nowait(socket->socket, args->msg);
     } else {
         rb_thread_wait_fd(zsocket_fd(socket->socket));
+        if (zsocket_sndtimeo(socket->socket) != -1)
+            return (VALUE)zstr_send(socket->socket, args->msg);
         goto try_writable;
     }
 #endif
@@ -326,6 +326,8 @@ try_writable:
     if ((zsocket_events(socket->socket) & ZMQ_POLLOUT) == ZMQ_POLLOUT) {
         return (VALUE)zstr_sendm(socket->socket, args->msg);
     } else {
+        if (zsocket_sndtimeo(socket->socket) != -1)
+            return (VALUE)zstr_sendm(socket->socket, args->msg);
         rb_thread_wait_fd(zsocket_fd(socket->socket));
         goto try_writable;
     }
@@ -420,6 +422,8 @@ try_readable:
         return (VALUE)zlist_pop(socket->str_buffer);
      } else {
         rb_thread_wait_fd(zsocket_fd(socket->socket));
+        if (zsocket_rcvtimeo(socket->socket) != -1)
+            return zstr_recv(socket->socket);
         goto try_readable;
      }
 #endif
@@ -784,92 +788,6 @@ static VALUE rb_czmq_socket_recv_message(VALUE obj)
     return rb_czmq_alloc_message(message);
 }
 
-/*
- *  call-seq:
- *     sock.recv_timeout = 5 =>  nil
- *
- *  Sets a receive timeout for this socket.
- *
- * === Examples
- *     ctx = ZMQ::Context.new
- *     sock = ctx.socket(:REP)
- *     sock.recv_timeout = 5 => nil
- *
-*/
-
-static VALUE rb_czmq_socket_set_recv_timeout(VALUE obj, VALUE timeout)
-{
-    zmq_sock_wrapper *sock = NULL;
-    GetZmqSocket(obj);
-    if (TYPE(timeout) != T_FIXNUM && TYPE(timeout) != T_FLOAT) rb_raise(rb_eTypeError, "wrong timeout type %s (expected Fixnum or Float)", RSTRING_PTR(rb_obj_as_string(timeout)));
-    sock->recv_timeout = timeout;
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     sock.recv_timeout =>  Fixnum or nil
- *
- *  Returns the recv timeout currently associated with this socket.
- *
- * === Examples
- *     ctx = ZMQ::Context.new
- *     sock = ctx.socket(:REP)
- *     sock.recv_timeout = 5
- *     sock.recv_timeout   =>   5
- *
-*/
-
-static VALUE rb_czmq_socket_recv_timeout(VALUE obj)
-{
-    zmq_sock_wrapper *sock = NULL;
-    GetZmqSocket(obj);
-    return sock->recv_timeout;
-}
-
-/*
- *  call-seq:
- *     sock.send_timeout = 5 =>  nil
- *
- *  Sets a send timeout for this socket.
- *
- * === Examples
- *     ctx = ZMQ::Context.new
- *     sock = ctx.socket(:REP)
- *     sock.send_timeout = 5 => nil
- *
-*/
-
-static VALUE rb_czmq_socket_set_send_timeout(VALUE obj, VALUE timeout)
-{
-    zmq_sock_wrapper *sock = NULL;
-    GetZmqSocket(obj);
-    if (TYPE(timeout) != T_FIXNUM && TYPE(timeout) != T_FLOAT) rb_raise(rb_eTypeError, "wrong timeout type %s (expected Fixnum or Float)", RSTRING_PTR(rb_obj_as_string(timeout)));
-    sock->send_timeout = timeout;
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     sock.send_timeout =>  Fixnum or nil
- *
- *  Returns the send timeout currently associated with this socket.
- *
- * === Examples
- *     ctx = ZMQ::Context.new
- *     sock = ctx.socket(:REP)
- *     sock.send_timeout = 5
- *     sock.send_timeout   =>   5
- *
-*/
-
-static VALUE rb_czmq_socket_send_timeout(VALUE obj)
-{
-    zmq_sock_wrapper *sock = NULL;
-    GetZmqSocket(obj);
-    return sock->send_timeout;
-}
-
 /*
  *  call-seq:
  *     sock.hwm =>  Fixnum
@@ -1601,10 +1519,6 @@ void _init_rb_czmq_socket()
     rb_define_method(rb_cZmqSocket, "recv_frame", rb_czmq_socket_recv_frame, 0);
     rb_define_method(rb_cZmqSocket, "recv_frame_nonblock", rb_czmq_socket_recv_frame_nonblock, 0);
     rb_define_method(rb_cZmqSocket, "recv_message", rb_czmq_socket_recv_message, 0);
-    rb_define_method(rb_cZmqSocket, "recv_timeout=", rb_czmq_socket_set_recv_timeout, 1);
-    rb_define_method(rb_cZmqSocket, "recv_timeout", rb_czmq_socket_recv_timeout, 0);
-    rb_define_method(rb_cZmqSocket, "send_timeout=", rb_czmq_socket_set_send_timeout, 1);
-    rb_define_method(rb_cZmqSocket, "send_timeout", rb_czmq_socket_send_timeout, 0);
 
     rb_define_method(rb_cZmqSocket, "hwm", rb_czmq_socket_opt_hwm, 0);
     rb_define_method(rb_cZmqSocket, "hwm=", rb_czmq_socket_set_opt_hwm, 1);

data/ext/rbczmq/socket.h

@@ -22,12 +22,8 @@ typedef struct {
 #endif
     VALUE endpoint;
     VALUE thread;
-    VALUE recv_timeout;
-    VALUE send_timeout;
 } zmq_sock_wrapper;
 
-#define ZMQ_SOCKET_DEFAULT_TIMEOUT Qnil
-
 #define ZmqAssertSocket(obj) ZmqAssertType(obj, rb_cZmqSocket, "ZMQ::Socket")
 #define GetZmqSocket(obj) \
     ZmqAssertSocket(obj); \

data/lib/zmq/version.rb

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

data/test/test_socket.rb

@@ -3,6 +3,42 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
 class TestZmqSocket < ZmqTestCase
+  def test_recv_timeout
+    ctx = ZMQ::Context.new
+    rep = ctx.bind(:REP, "inproc://test.socket-recv-timeout")
+    start = Time.now.to_f
+    rep.rcvtimeo = 300
+    rep.recv
+    elapsed = Time.now.to_f - start
+    assert_in_delta elapsed, 0.29, 0.32
+  ensure
+    ctx.destroy
+  end
+
+  def test_send_timeout
+    ctx = ZMQ::Context.new
+    rep = ctx.socket(:REP)
+    rep.hwm = 1
+    rep.bind("inproc://test.socket-send-timeout")
+    req = ctx.connect(:REQ, "inproc://test.socket-send-timeout")
+    # Cannot test much other than normal transfer's not disrupted
+    req.sndtimeo = 100
+    req.send "msg"
+    assert_equal "msg", rep.recv
+  ensure
+    ctx.destroy
+  end
+
+  def test_connect_no_io_thread
+    ctx = ZMQ::Context.new(0)
+    sock = ctx.socket(:REP)
+    assert_raises ZMQ::Error do
+      sock.bind("tcp://127.0.0.1:*")
+    end
+  ensure
+    ctx.destroy
+  end
+
   def test_fd
     ctx = ZMQ::Context.new
     sock = ctx.socket(:REP)
@@ -54,32 +90,6 @@ class TestZmqSocket < ZmqTestCase
     ctx.destroy
   end
 
-  def test_recv_timeout
-    ctx = ZMQ::Context.new
-    sock = ctx.socket(:REP)
-    assert_nil sock.recv_timeout
-    sock.recv_timeout = 10
-    assert_equal 10, sock.recv_timeout
-    assert_raises TypeError do
-      sock.recv_timeout = :x
-    end
-  ensure
-    ctx.destroy
-  end
-
-  def test_send_timeout
-    ctx = ZMQ::Context.new
-    sock = ctx.socket(:REP)
-    assert_nil sock.send_timeout
-    sock.send_timeout = 10
-    assert_equal 10, sock.send_timeout
-    assert_raises TypeError do
-      sock.send_timeout = :x
-    end
-  ensure
-    ctx.destroy
-  end
-
   def test_gc_context_reaped
     pub = ZMQ::Context.new.socket(:PUB)
     GC.start

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rbczmq
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
-  - 6
-  version: "0.6"
+  - 7
+  version: "0.7"
 platform: ruby
 authors: 
 - "Lourens Naud\xC3\xA9"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-10 00:00:00 Z
+date: 2012-05-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: "Ruby extension for CZMQ - High-level C Binding for \xC3\x98MQ (http://czmq.zeromq.org)"
@@ -204,4 +204,3 @@ test_files:
 - test/test_threading.rb
 - test/test_timer.rb
 - test/test_zmq.rb
-has_rdoc: true