rbczmq 0.1 → 0.2

data/README.rdoc

@@ -231,16 +231,14 @@ Running tests
 * OS X leaks utility - http://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man1/leaks.1.html
 * Handle GC issue with timers in loop callbacks
 * czmq send methods aren't non-blocking by default
-* Enforce socket timeouts
 * Revisit the ZMQ::Loop API
-* Push gem out to rubygems.org
 * RDOC fail on mixed C and Ruby source files that document that same constants
 * GC guards to prevent recycling objects being sent / received.
 * Sockets can bind && connect to multiple endpoints - account for that
 * Watch out for further cases where REQ / REP pairs could raise EFSM
 * Do not clobber local scope from macros (James's commit in master)
-* Support installation without vendor'ed libs as well
 * Incorporate examples into CI as well
+* Zero-copy semantics for frames
 
 == Contact, feedback and bugs
 

data/ext/rbczmq/context.c

@@ -173,6 +173,50 @@ static VALUE rb_czmq_ctx_set_linger(VALUE obj, VALUE linger)
     return Qnil;
 }
 
+/*
+ *  call-seq:
+ *     ctx.hwm    =>  Fixnum
+ *
+ *  Returns High Water Mark (HWM) option used for native thread creation (non-Ruby threads, ahead of time API addition)
+ *
+ * === Examples
+ *     ctx = ZMQ::Context.new
+ *     ctx.hwm    =>   1
+ *
+*/
+
+static VALUE rb_czmq_ctx_hwm(VALUE obj)
+{
+    errno = 0;
+    int wm;
+    ZmqGetContext(obj);
+    return INT2FIX(zctx_hwm(ctx->ctx));
+}
+
+/*
+ *  call-seq:
+ *     ctx.hwm = 100    =>  nil
+ *
+ *  Sets the High Water Mark (HWM) option used for native thread creation (non-Ruby threads, ahead of time API addition)
+ *
+ * === Examples
+ *     ctx = ZMQ::Context.new
+ *     ctx.hwm = 100    =>   nil
+ *
+*/
+
+static VALUE rb_czmq_ctx_set_hwm(VALUE obj, VALUE hwm)
+{
+    errno = 0;
+    int wm;
+    ZmqGetContext(obj);
+    Check_Type(hwm, T_FIXNUM);
+    wm = FIX2INT(hwm);
+    if (wm < 0) rb_raise(rb_eZmqError, "negative HWM values is not supported.");
+    zctx_set_hwm(ctx->ctx, wm);
+    return Qnil;
+}
+
 /*
  * :nodoc:
  *  Creates a new socket while the GIL is released.
@@ -277,4 +321,6 @@ void _init_rb_czmq_context()
     rb_define_method(rb_cZmqContext, "iothreads=", rb_czmq_ctx_set_iothreads, 1);
     rb_define_method(rb_cZmqContext, "linger=", rb_czmq_ctx_set_linger, 1);
     rb_define_method(rb_cZmqContext, "socket", rb_czmq_ctx_socket, 1);
+    rb_define_method(rb_cZmqContext, "hwm", rb_czmq_ctx_hwm, 0);
+    rb_define_method(rb_cZmqContext, "hwm=", rb_czmq_ctx_set_hwm, 1);
 }

data/ext/rbczmq/extconf.rb

@@ -123,7 +123,7 @@ $INCFLAGS << " -I#{czmq_include_path}" if find_header("czmq.h", czmq_include_pat
 $LIBPATH << libs_path.to_s
 
 # Special case to prevent Rubinius compile from linking system libzmq if present
-if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /rbx/
+if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /rbx/ && RUBY_PLATFORM =~ /linux/
   CONFIG['LDSHARED'] = "#{CONFIG['LDSHARED']} -Wl,-rpath=#{libs_path.to_s}"
 end
 

data/ext/rbczmq/frame.c

@@ -381,6 +381,7 @@ void _init_rb_czmq_frame()
 
     rb_define_const(rb_cZmqFrame, "MORE", INT2NUM(ZFRAME_MORE));
     rb_define_const(rb_cZmqFrame, "REUSE", INT2NUM(ZFRAME_REUSE));
+    rb_define_const(rb_cZmqFrame, "DONTWAIT", INT2NUM(ZFRAME_DONTWAIT));
 
     rb_define_singleton_method(rb_cZmqFrame, "new", rb_czmq_frame_s_new, -1);
     rb_define_method(rb_cZmqFrame, "destroy", rb_czmq_frame_destroy, 0);

data/ext/rbczmq/loop.c

@@ -1,10 +1,5 @@
 #include <rbczmq_ext.h>
 
-static VALUE intern_call;
-static VALUE intern_readable;
-static VALUE intern_writable;
-static VALUE intern_error;
-
 /*
  * :nodoc:
  *  Wraps rb_funcall to support callbacks with or without callbacks.
@@ -393,11 +388,6 @@ static VALUE rb_czmq_loop_cancel_timer(VALUE obj, VALUE tm)
 
 void _init_rb_czmq_loop()
 {
-    intern_call = rb_intern("call");
-    intern_readable = rb_intern("on_readable");
-    intern_writable = rb_intern("on_writable");
-    intern_error = rb_intern("on_error");
-
     rb_cZmqLoop = rb_define_class_under(rb_mZmq, "Loop", rb_cObject);
 
     rb_define_alloc_func(rb_cZmqLoop, rb_czmq_loop_new);

data/ext/rbczmq/pollitem.c

@@ -207,6 +207,9 @@ VALUE rb_czmq_pollitem_handler(VALUE obj)
 VALUE rb_czmq_pollitem_handler_equals(VALUE obj, VALUE handler)
 {
     ZmqGetPollitem(obj);
+    ZmqAssertHandler(obj, pollitem, handler, intern_error);
+    ZmqAssertHandler(obj, pollitem, handler, intern_readable);
+    ZmqAssertHandler(obj, pollitem, handler, intern_writable);
     pollitem->handler = handler;
     return Qnil;
 }

data/ext/rbczmq/pollitem.h

@@ -16,6 +16,10 @@ typedef struct {
     Data_Get_Struct(obj, zmq_pollitem_wrapper, pollitem); \
     if (!pollitem) rb_raise(rb_eTypeError, "uninitialized ZMQ pollitem!");
 
+#define ZmqAssertHandler(obj, pollitem, handler, callback) \
+    if (!rb_respond_to(handler, (callback))) \
+        rb_raise(rb_eZmqError, "Pollable entity %s's handler %s expected to implement an %s callback!", RSTRING_PTR(rb_obj_as_string(rb_czmq_pollitem_pollable((obj)))), rb_obj_classname(handler), rb_id2name((callback)));
+
 VALUE rb_czmq_pollitem_coerce(VALUE pollable);
 VALUE rb_czmq_pollitem_pollable(VALUE obj);
 VALUE rb_czmq_pollitem_events(VALUE obj);

data/ext/rbczmq/rbczmq_ext.c

@@ -24,6 +24,11 @@ VALUE rb_cZmqPollitem;
 
 st_table *frames_map = NULL;
 
+VALUE intern_call;
+VALUE intern_readable;
+VALUE intern_writable;
+VALUE intern_error;
+
 #ifdef HAVE_RUBY_ENCODING_H
 rb_encoding *binary_encoding;
 #endif
@@ -152,6 +157,11 @@ void Init_rbczmq_ext()
 {
     frames_map = st_init_numtable();
 
+    intern_call = rb_intern("call");
+    intern_readable = rb_intern("on_readable");
+    intern_writable = rb_intern("on_writable");
+    intern_error = rb_intern("on_error");
+
 #ifdef HAVE_RUBY_ENCODING_H
     binary_encoding = rb_enc_find("binary");
 #endif

data/ext/rbczmq/rbczmq_ext.h

@@ -61,6 +61,11 @@ extern VALUE rb_cZmqPollitem;
 
 extern st_table *frames_map;
 
+extern VALUE intern_call;
+extern VALUE intern_readable;
+extern VALUE intern_writable;
+extern VALUE intern_error;
+
 #include <context.h>
 #include <socket.h>
 #include <frame.h>

data/ext/rbczmq/socket.c

@@ -60,7 +60,7 @@ void rb_czmq_free_sock_gc(void *ptr)
             zclock_log ("I: %s socket %p, context %p: GC free", zsocket_type_str(sock->socket), sock, sock->ctx);
 /*
         XXX: cyclic dependency
-        #4  0x0000000100712524 in zsockopt_set_linger (linger=1, socket=<value temporarily unavailable, due to optimizations>) at zsockopt.c:288
+        #4  0x0000000100712524 in zsocket_set_linger (linger=1, socket=<value temporarily unavailable, due to optimizations>) at zsocket.c:288
         if (sock->socket != NULL && !(sock->flags & ZMQ_SOCKET_DESTROYED)) rb_czmq_free_sock(sock);
 */
 #ifndef HAVE_RB_THREAD_BLOCKING_REGION
@@ -161,7 +161,7 @@ static VALUE rb_czmq_socket_fd(VALUE obj)
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
     if (sock->state == ZMQ_SOCKET_PENDING) return INT2NUM(-1);
-    return INT2NUM(zsockopt_fd(sock->socket));
+    return INT2NUM(zsocket_fd(sock->socket));
 }
 
 /*
@@ -307,10 +307,10 @@ static VALUE rb_czmq_nogvl_zstr_send(void *ptr)
 #else
     if (rb_thread_alone()) return (VALUE)zstr_send_nowait(socket->socket, args->msg);
 try_writable:
-    if ((zsockopt_events(socket->socket) & ZMQ_POLLOUT) == ZMQ_POLLOUT) {
+    if ((zsocket_events(socket->socket) & ZMQ_POLLOUT) == ZMQ_POLLOUT) {
         return (VALUE)zstr_send_nowait(socket->socket, args->msg);
     } else {
-        rb_thread_wait_fd(zsockopt_fd(socket->socket));
+        rb_thread_wait_fd(zsocket_fd(socket->socket));
         goto try_writable;
     }
 #endif
@@ -331,10 +331,10 @@ static VALUE rb_czmq_nogvl_zstr_sendm(void *ptr)
 #else
     if (rb_thread_alone()) return (VALUE)zstr_sendm(socket->socket, args->msg);
 try_writable:
-    if ((zsockopt_events(socket->socket) & ZMQ_POLLOUT) == ZMQ_POLLOUT) {
+    if ((zsocket_events(socket->socket) & ZMQ_POLLOUT) == ZMQ_POLLOUT) {
         return (VALUE)zstr_sendm(socket->socket, args->msg);
     } else {
-        rb_thread_wait_fd(zsockopt_fd(socket->socket));
+        rb_thread_wait_fd(zsocket_fd(socket->socket));
         goto try_writable;
     }
 #endif
@@ -421,13 +421,13 @@ static VALUE rb_czmq_nogvl_recv(void *ptr)
     if (zlist_size(socket->str_buffer) != 0)
        return (VALUE)zlist_pop(socket->str_buffer);
 try_readable:
-    if ((zsockopt_events(socket->socket) & ZMQ_POLLIN) == ZMQ_POLLIN) {
+    if ((zsocket_events(socket->socket) & ZMQ_POLLIN) == ZMQ_POLLIN) {
         do {
             zlist_append(socket->str_buffer, zstr_recv_nowait(socket->socket));
         } while (zmq_errno() != EAGAIN && zmq_errno() != EINTR);
         return (VALUE)zlist_pop(socket->str_buffer);
      } else {
-        rb_thread_wait_fd(zsockopt_fd(socket->socket));
+        rb_thread_wait_fd(zsocket_fd(socket->socket));
         goto try_readable;
      }
 #endif
@@ -515,10 +515,10 @@ static VALUE rb_czmq_nogvl_send_frame(void *ptr)
 #else
     if (rb_thread_alone()) return (VALUE)zframe_send(&(args->frame), socket->socket, args->flags);
 try_writable:
-    if ((zsockopt_events(socket->socket) & ZMQ_POLLOUT) == ZMQ_POLLOUT) {
+    if ((zsocket_events(socket->socket) & ZMQ_POLLOUT) == ZMQ_POLLOUT) {
         return (VALUE)zframe_send(&(args->frame), socket->socket, args->flags);
     } else {
-        rb_thread_wait_fd(zsockopt_fd(socket->socket));
+        rb_thread_wait_fd(zsocket_fd(socket->socket));
         goto try_writable;
     }
 #endif
@@ -596,10 +596,10 @@ static VALUE rb_czmq_nogvl_send_message(void *ptr)
         return Qnil;
     }
 try_writable:
-    if ((zsockopt_events(socket->socket) & ZMQ_POLLOUT) == ZMQ_POLLOUT) {
+    if ((zsocket_events(socket->socket) & ZMQ_POLLOUT) == ZMQ_POLLOUT) {
         zmsg_send(&(args->message), socket->socket);
     } else {
-        rb_thread_wait_fd(zsockopt_fd(socket->socket));
+        rb_thread_wait_fd(zsocket_fd(socket->socket));
         goto try_writable;
     }
 #endif
@@ -656,13 +656,13 @@ static VALUE rb_czmq_nogvl_recv_frame(void *ptr)
     if (zlist_size(socket->frame_buffer) != 0)
        return (VALUE)zlist_pop(socket->frame_buffer);
 try_readable:
-    if ((zsockopt_events(socket->socket) & ZMQ_POLLIN) == ZMQ_POLLIN) {
+    if ((zsocket_events(socket->socket) & ZMQ_POLLIN) == ZMQ_POLLIN) {
         do {
             zlist_append(socket->frame_buffer, zframe_recv_nowait(socket->socket));
         } while (zmq_errno() != EAGAIN && zmq_errno() != EINTR);
         return (VALUE)zlist_pop(socket->frame_buffer);
      } else {
-        rb_thread_wait_fd(zsockopt_fd(socket->socket));
+        rb_thread_wait_fd(zsocket_fd(socket->socket));
         goto try_readable;
      }
 #endif
@@ -751,13 +751,13 @@ static VALUE rb_czmq_nogvl_recv_message(void *ptr)
     if (zlist_size(socket->msg_buffer) != 0)
        return (VALUE)zlist_pop(socket->msg_buffer);
 try_readable:
-    if ((zsockopt_events(socket->socket) & ZMQ_POLLIN) == ZMQ_POLLIN) {
+    if ((zsocket_events(socket->socket) & ZMQ_POLLIN) == ZMQ_POLLIN) {
         do {
             zlist_append(socket->msg_buffer, zmsg_recv(socket->socket));
         } while (zmq_errno() != EAGAIN && zmq_errno() != EINTR);
         return (VALUE)zlist_pop(socket->msg_buffer);
      } else {
-        rb_thread_wait_fd(zsockopt_fd(socket->socket));
+        rb_thread_wait_fd(zsocket_fd(socket->socket));
         goto try_readable;
      }
 #endif
@@ -895,7 +895,7 @@ static VALUE rb_czmq_socket_opt_hwm(VALUE obj)
 {
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return INT2NUM(zsockopt_hwm(sock->socket));
+    return INT2NUM(zsocket_hwm(sock->socket));
 }
 
 /*
@@ -915,7 +915,7 @@ static VALUE rb_czmq_socket_opt_hwm(VALUE obj)
 static VALUE rb_czmq_socket_set_opt_hwm(VALUE obj, VALUE value)
 {
     zmq_sock_wrapper *sock = NULL;
-    ZmqSetSockOpt(obj, zsockopt_set_hwm, "HWM", value);
+    ZmqSetSockOpt(obj, zsocket_set_hwm, "HWM", value);
 }
 
 /*
@@ -935,7 +935,7 @@ static VALUE rb_czmq_socket_opt_swap(VALUE obj)
 {
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return INT2NUM(zsockopt_swap(sock->socket));
+    return INT2NUM(zsocket_swap(sock->socket));
 }
 
 /*
@@ -954,7 +954,7 @@ static VALUE rb_czmq_socket_opt_swap(VALUE obj)
 static VALUE rb_czmq_socket_set_opt_swap(VALUE obj, VALUE value)
 {
     zmq_sock_wrapper *sock = NULL;
-    ZmqSetSockOpt(obj, zsockopt_set_swap, "SWAP", value);
+    ZmqSetSockOpt(obj, zsocket_set_swap, "SWAP", value);
 }
 
 /*
@@ -974,7 +974,7 @@ static VALUE rb_czmq_socket_opt_affinity(VALUE obj)
 {
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return INT2NUM(zsockopt_affinity(sock->socket));
+    return INT2NUM(zsocket_affinity(sock->socket));
 }
 
 /*
@@ -993,7 +993,7 @@ static VALUE rb_czmq_socket_opt_affinity(VALUE obj)
 static VALUE rb_czmq_socket_set_opt_affinity(VALUE obj, VALUE value)
 {
     zmq_sock_wrapper *sock = NULL;
-    ZmqSetSockOpt(obj, zsockopt_set_affinity, "AFFINITY", value);
+    ZmqSetSockOpt(obj, zsocket_set_affinity, "AFFINITY", value);
 }
 
 /*
@@ -1013,7 +1013,7 @@ static VALUE rb_czmq_socket_opt_rate(VALUE obj)
 {
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return INT2NUM(zsockopt_rate(sock->socket));
+    return INT2NUM(zsocket_rate(sock->socket));
 }
 
 /*
@@ -1032,7 +1032,7 @@ static VALUE rb_czmq_socket_opt_rate(VALUE obj)
 static VALUE rb_czmq_socket_set_opt_rate(VALUE obj, VALUE value)
 {
     zmq_sock_wrapper *sock = NULL;
-    ZmqSetSockOpt(obj, zsockopt_set_rate, "RATE", value);
+    ZmqSetSockOpt(obj, zsocket_set_rate, "RATE", value);
 }
 
 /*
@@ -1052,7 +1052,7 @@ static VALUE rb_czmq_socket_opt_recovery_ivl(VALUE obj)
 {
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return INT2NUM(zsockopt_recovery_ivl(sock->socket));
+    return INT2NUM(zsocket_recovery_ivl(sock->socket));
 }
 
 /*
@@ -1071,7 +1071,7 @@ static VALUE rb_czmq_socket_opt_recovery_ivl(VALUE obj)
 static VALUE rb_czmq_socket_set_opt_recovery_ivl(VALUE obj, VALUE value)
 {
     zmq_sock_wrapper *sock = NULL;
-    ZmqSetSockOpt(obj, zsockopt_set_recovery_ivl, "RECOVERY_IVL", value);
+    ZmqSetSockOpt(obj, zsocket_set_recovery_ivl, "RECOVERY_IVL", value);
 }
 
 /*
@@ -1091,7 +1091,7 @@ static VALUE rb_czmq_socket_opt_recovery_ivl_msec(VALUE obj)
 {
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return INT2NUM(zsockopt_recovery_ivl_msec(sock->socket));
+    return INT2NUM(zsocket_recovery_ivl_msec(sock->socket));
 }
 
 /*
@@ -1110,7 +1110,7 @@ static VALUE rb_czmq_socket_opt_recovery_ivl_msec(VALUE obj)
 static VALUE rb_czmq_socket_set_opt_recovery_ivl_msec(VALUE obj, VALUE value)
 {
     zmq_sock_wrapper *sock = NULL;
-    ZmqSetSockOpt(obj, zsockopt_set_recovery_ivl_msec, "RECOVERY_IVL_MSEC", value);
+    ZmqSetSockOpt(obj, zsocket_set_recovery_ivl_msec, "RECOVERY_IVL_MSEC", value);
 }
 
 /*
@@ -1130,7 +1130,7 @@ static VALUE rb_czmq_socket_opt_mcast_loop(VALUE obj)
 {
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return (zsockopt_mcast_loop(sock->socket) == 1) ? Qtrue : Qfalse;
+    return (zsocket_mcast_loop(sock->socket) == 1) ? Qtrue : Qfalse;
 }
 
 /*
@@ -1149,7 +1149,7 @@ static VALUE rb_czmq_socket_opt_mcast_loop(VALUE obj)
 static VALUE rb_czmq_socket_set_opt_mcast_loop(VALUE obj, VALUE value)
 {
     zmq_sock_wrapper *sock = NULL;
-    ZmqSetBooleanSockOpt(obj, zsockopt_set_mcast_loop, "MCAST_LOOP", value);
+    ZmqSetBooleanSockOpt(obj, zsocket_set_mcast_loop, "MCAST_LOOP", value);
 }
 
 /*
@@ -1169,7 +1169,7 @@ static VALUE rb_czmq_socket_opt_sndbuf(VALUE obj)
 {
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return INT2NUM(zsockopt_sndbuf(sock->socket));
+    return INT2NUM(zsocket_sndbuf(sock->socket));
 }
 
 /*
@@ -1188,7 +1188,7 @@ static VALUE rb_czmq_socket_opt_sndbuf(VALUE obj)
 static VALUE rb_czmq_socket_set_opt_sndbuf(VALUE obj, VALUE value)
 {
     zmq_sock_wrapper *sock = NULL;
-    ZmqSetSockOpt(obj, zsockopt_set_sndbuf, "SNDBUF", value);
+    ZmqSetSockOpt(obj, zsocket_set_sndbuf, "SNDBUF", value);
 }
 
 /*
@@ -1208,7 +1208,7 @@ static VALUE rb_czmq_socket_opt_rcvbuf(VALUE obj)
 {
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return INT2NUM(zsockopt_rcvbuf(sock->socket));
+    return INT2NUM(zsocket_rcvbuf(sock->socket));
 }
 
 /*
@@ -1227,7 +1227,7 @@ static VALUE rb_czmq_socket_opt_rcvbuf(VALUE obj)
 static VALUE rb_czmq_socket_set_opt_rcvbuf(VALUE obj, VALUE value)
 {
     zmq_sock_wrapper *sock = NULL;
-    ZmqSetSockOpt(obj, zsockopt_set_rcvbuf, "RCVBUF", value);
+    ZmqSetSockOpt(obj, zsocket_set_rcvbuf, "RCVBUF", value);
 }
 
 /*
@@ -1247,7 +1247,7 @@ static VALUE rb_czmq_socket_opt_linger(VALUE obj)
 {
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return INT2NUM(zsockopt_linger(sock->socket));
+    return INT2NUM(zsocket_linger(sock->socket));
 }
 
 /*
@@ -1266,7 +1266,7 @@ static VALUE rb_czmq_socket_opt_linger(VALUE obj)
 static VALUE rb_czmq_socket_set_opt_linger(VALUE obj, VALUE value)
 {
     zmq_sock_wrapper *sock = NULL;
-    ZmqSetSockOpt(obj, zsockopt_set_linger, "LINGER", value);
+    ZmqSetSockOpt(obj, zsocket_set_linger, "LINGER", value);
 }
 
 /*
@@ -1286,7 +1286,7 @@ static VALUE rb_czmq_socket_opt_backlog(VALUE obj)
 {
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return INT2NUM(zsockopt_backlog(sock->socket));
+    return INT2NUM(zsocket_backlog(sock->socket));
 }
 
 /*
@@ -1305,7 +1305,7 @@ static VALUE rb_czmq_socket_opt_backlog(VALUE obj)
 static VALUE rb_czmq_socket_set_opt_backlog(VALUE obj, VALUE value)
 {
     zmq_sock_wrapper *sock = NULL;
-    ZmqSetSockOpt(obj, zsockopt_set_backlog, "BACKLOG", value);
+    ZmqSetSockOpt(obj, zsocket_set_backlog, "BACKLOG", value);
 }
 
 /*
@@ -1325,7 +1325,7 @@ static VALUE rb_czmq_socket_opt_reconnect_ivl(VALUE obj)
 {
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return INT2NUM(zsockopt_reconnect_ivl(sock->socket));
+    return INT2NUM(zsocket_reconnect_ivl(sock->socket));
 }
 
 /*
@@ -1344,7 +1344,7 @@ static VALUE rb_czmq_socket_opt_reconnect_ivl(VALUE obj)
 static VALUE rb_czmq_socket_set_opt_reconnect_ivl(VALUE obj, VALUE value)
 {
     zmq_sock_wrapper *sock = NULL;
-    ZmqSetSockOpt(obj, zsockopt_set_reconnect_ivl, "RECONNECT_IVL", value);
+    ZmqSetSockOpt(obj, zsocket_set_reconnect_ivl, "RECONNECT_IVL", value);
 }
 
 /*
@@ -1364,7 +1364,7 @@ static VALUE rb_czmq_socket_opt_reconnect_ivl_max(VALUE obj)
 {
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return INT2NUM(zsockopt_reconnect_ivl_max(sock->socket));
+    return INT2NUM(zsocket_reconnect_ivl_max(sock->socket));
 }
 
 /*
@@ -1383,7 +1383,7 @@ static VALUE rb_czmq_socket_opt_reconnect_ivl_max(VALUE obj)
 static VALUE rb_czmq_socket_set_opt_reconnect_ivl_max(VALUE obj, VALUE value)
 {
     zmq_sock_wrapper *sock = NULL;
-    ZmqSetSockOpt(obj, zsockopt_set_reconnect_ivl_max, "RECONNECT_IVL_MAX", value);
+    ZmqSetSockOpt(obj, zsocket_set_reconnect_ivl_max, "RECONNECT_IVL_MAX", value);
 }
 
 /*
@@ -1409,7 +1409,7 @@ static VALUE rb_czmq_socket_set_opt_identity(VALUE obj, VALUE value)
     if (RSTRING_LEN(value) == 0) rb_raise(rb_eZmqError, "socket identity cannot be empty.");
     if (RSTRING_LEN(value) > 255) rb_raise(rb_eZmqError, "maximum socket identity is 255 chars.");
     val = StringValueCStr(value);
-    zsockopt_set_identity(sock->socket, val);
+    zsocket_set_identity(sock->socket, val);
     if (sock->verbose)
         zclock_log ("I: %s socket %p: set option \"IDENTITY\" \"%s\"", zsocket_type_str(sock->socket), obj, val);
     return Qnil;
@@ -1431,7 +1431,7 @@ static VALUE rb_czmq_socket_set_opt_identity(VALUE obj, VALUE value)
 static VALUE rb_czmq_socket_set_opt_subscribe(VALUE obj, VALUE value)
 {
     zmq_sock_wrapper *sock = NULL;
-    ZmqSetStringSockOpt(obj, zsockopt_set_subscribe, "SUBSCRIBE", value, {
+    ZmqSetStringSockOpt(obj, zsocket_set_subscribe, "SUBSCRIBE", value, {
        ZmqAssertSockOptFor(ZMQ_SUB)
     });
 }
@@ -1452,7 +1452,7 @@ static VALUE rb_czmq_socket_set_opt_subscribe(VALUE obj, VALUE value)
 static VALUE rb_czmq_socket_set_opt_unsubscribe(VALUE obj, VALUE value)
 {
     zmq_sock_wrapper *sock = NULL;
-    ZmqSetStringSockOpt(obj, zsockopt_set_unsubscribe, "UNSUBSCRIBE", value, {
+    ZmqSetStringSockOpt(obj, zsocket_set_unsubscribe, "UNSUBSCRIBE", value, {
        ZmqAssertSockOptFor(ZMQ_SUB)
     });
 }
@@ -1474,7 +1474,7 @@ static VALUE rb_czmq_socket_opt_rcvmore(VALUE obj)
 {
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return (zsockopt_rcvmore(sock->socket) == 1) ? Qtrue : Qfalse;
+    return (zsocket_rcvmore(sock->socket) == 1) ? Qtrue : Qfalse;
 }
 
 /*
@@ -1494,7 +1494,85 @@ static VALUE rb_czmq_socket_opt_events(VALUE obj)
 {
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return INT2NUM(zsockopt_events(sock->socket));
+    return INT2NUM(zsocket_events(sock->socket));
+}
+
+/*
+ *  call-seq:
+ *     sock.rcvtimeo =>  Fixnum
+ *
+ *  Returns the socket RCVTIMEO value.
+ *
+ * === Examples
+ *     ctx = ZMQ::Context.new
+ *     sock = ctx.socket(:REP)
+ *     sock.rcvtimeo  =>  -1
+ *
+*/
+
+static VALUE rb_czmq_socket_opt_rcvtimeo(VALUE obj)
+{
+    zmq_sock_wrapper *sock = NULL;
+    GetZmqSocket(obj);
+    return INT2NUM(zsocket_rcvtimeo(sock->socket));
+}
+
+/*
+ *  call-seq:
+ *     sock.rcvtimeout = 200 =>  nil
+ *
+ *  Sets the socket RCVTIMEO value.
+ *
+ * === Examples
+ *     ctx = ZMQ::Context.new
+ *     sock = ctx.socket(:REP)
+ *     sock.rcvtimeo = 200  =>  nil
+ *
+*/
+
+static VALUE rb_czmq_socket_set_opt_rcvtimeo(VALUE obj, VALUE value)
+{
+    zmq_sock_wrapper *sock = NULL;
+    ZmqSetSockOpt(obj, zsocket_set_rcvtimeo, "RCVTIMEO", value);
+}
+
+/*
+ *  call-seq:
+ *     sock.sndtimeo =>  Fixnum
+ *
+ *  Returns the socket SNDTIMEO value.
+ *
+ * === Examples
+ *     ctx = ZMQ::Context.new
+ *     sock = ctx.socket(:REP)
+ *     sock.sndtimeo  =>  -1
+ *
+*/
+
+static VALUE rb_czmq_socket_opt_sndtimeo(VALUE obj)
+{
+    zmq_sock_wrapper *sock = NULL;
+    GetZmqSocket(obj);
+    return INT2NUM(zsocket_sndtimeo(sock->socket));
+}
+
+/*
+ *  call-seq:
+ *     sock.sndtimeout = 200 =>  nil
+ *
+ *  Sets the socket SNDTIMEO value.
+ *
+ * === Examples
+ *     ctx = ZMQ::Context.new
+ *     sock = ctx.socket(:REP)
+ *     sock.sndtimeo = 200  =>  nil
+ *
+*/
+
+static VALUE rb_czmq_socket_set_opt_sndtimeo(VALUE obj, VALUE value)
+{
+    zmq_sock_wrapper *sock = NULL;
+    ZmqSetSockOpt(obj, zsocket_set_sndtimeo, "SNDTIMEO", value);
 }
 
 void _init_rb_czmq_socket()
@@ -1567,4 +1645,8 @@ void _init_rb_czmq_socket()
     rb_define_method(rb_cZmqSocket, "unsubscribe", rb_czmq_socket_set_opt_unsubscribe, 1);
     rb_define_method(rb_cZmqSocket, "rcvmore?", rb_czmq_socket_opt_rcvmore, 0);
     rb_define_method(rb_cZmqSocket, "events", rb_czmq_socket_opt_events, 0);
+    rb_define_method(rb_cZmqSocket, "rcvtimeo", rb_czmq_socket_opt_rcvtimeo, 0);
+    rb_define_method(rb_cZmqSocket, "rcvtimeo=", rb_czmq_socket_set_opt_rcvtimeo, 1);
+    rb_define_method(rb_cZmqSocket, "sndtimeo", rb_czmq_socket_opt_sndtimeo, 0);
+    rb_define_method(rb_cZmqSocket, "sndtimeo=", rb_czmq_socket_set_opt_sndtimeo, 1);
 }

data/ext/rbczmq/socket.h

@@ -53,7 +53,7 @@ typedef struct {
       rb_raise(rb_eZmqError, "Cross thread violation for %s socket %p: created in thread %p, invoked on thread %p", zsocket_type_str((sock)->socket), (void *)(sock), (void *)(sock)->thread, (void *)rb_thread_current());
 
 #define ZmqAssertSockOptFor(sock_type) \
-    if (zsockopt_type(sock->socket) != sock_type) \
+    if (zsocket_type(sock->socket) != sock_type) \
         rb_raise(rb_eZmqError, "Socket option not supported on a %s socket!", zsocket_type_str(sock->socket));
 
 #define CheckBoolean(arg) \

data/ext/rbczmq/timer.c

@@ -1,7 +1,5 @@
 #include <rbczmq_ext.h>
 
-static VALUE intern_call;
-
 /*
  * :nodoc:
  *  GC mark callback
@@ -99,8 +97,6 @@ static VALUE rb_czmq_timer_cancel(VALUE obj)
 
 void _init_rb_czmq_timer()
 {
-    intern_call = rb_intern("call");
-
     rb_cZmqTimer = rb_define_class_under(rb_mZmq, "Timer", rb_cObject);
 
     rb_define_singleton_method(rb_cZmqTimer, "new", rb_czmq_timer_s_new, -1);

data/lib/zmq/loop.rb

@@ -63,7 +63,6 @@ class ZMQ::Loop
   def self.register_readable(pollable, handler = ZMQ::DefaultHandler, *args)
     pollitem = ZMQ::Pollitem.new(pollable, ZMQ::POLLIN)
     pollitem.handler = handler.new(pollitem, *args) if handler
-    assert_handler_for_event(pollitem, :on_readable)
     instance.register(pollitem)
   end
 
@@ -76,7 +75,6 @@ class ZMQ::Loop
   def self.register_writable(pollable, handler = ZMQ::DefaultHandler, *args)
     pollitem = ZMQ::Pollitem.new(pollable, ZMQ::POLLOUT)
     pollitem.handler = handler.new(pollitem, *args) if handler
-    assert_handler_for_event(pollitem, :on_writable)
     instance.register(pollitem)
   end
 
@@ -119,13 +117,6 @@ class ZMQ::Loop
     register_writable(socket, handler, args) if socket.poll_writable?
     ret
   end
-
-  def self.assert_handler_for_event(pollitem, cb)
-    unless pollitem.handler.respond_to?(cb)
-      pollitem.handler = nil
-      raise ZMQ::Error, "Pollable entity #{pollitem.pollable}'s handler #{pollitem.handler.class} expected to implement an #{cb} callback!"
-    end
-  end
 end
 
 ZL = ZMQ::Loop

data/lib/zmq/version.rb

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

data/test/test_context.rb

@@ -49,7 +49,7 @@ class TestZmqContext < ZmqTestCase
   def test_linger
     ctx = ZMQ::Context.new
     assert_raises TypeError do
-      ctx.linger = :invalid  
+      ctx.linger = :invalid 
     end
     ctx.linger = 10
     assert_raises ZMQ::Error do
@@ -59,6 +59,20 @@ class TestZmqContext < ZmqTestCase
     ctx.destroy
   end
 
+  def test_hwm
+    ctx = ZMQ::Context.new
+    assert_raises TypeError do
+      ctx.hwm = :invalid
+    end
+    ctx.hwm = 10
+    assert_raises ZMQ::Error do
+      ctx.hwm = -2
+    end
+    assert_equal 10, ctx.hwm
+  ensure
+    ctx.destroy
+  end
+
   def test_bind_connect
     ctx = ZMQ::Context.new
     rep = ctx.bind(:REP, "inproc://test.bind_connect")

data/test/test_pollitem.rb

@@ -43,10 +43,20 @@ class TestZmqPollitem < ZmqTestCase
     ctx.destroy
   end
 
+  class TestHandler
+    def initialize(*args); end
+    def on_error(*args); end
+    def on_readable(*args); end
+    def on_writable(*args); end
+  end
+
   def test_handler
     pollitem = ZMQ::Pollitem.new(STDIN, ZMQ::POLLIN)
     assert_nil pollitem.handler
-    handler = Module.new
+    assert_raises ZMQ::Error do
+      pollitem.handler = Module.new
+    end
+    handler = TestHandler.new
     pollitem.handler = handler
     assert_equal handler, pollitem.handler
   end

data/test/test_socket.rb

@@ -296,6 +296,25 @@ class TestZmqSocket < ZmqTestCase
     ctx.destroy
   end
 
+  def test_send_frame_dontwait
+    ctx = ZMQ::Context.new
+    rep = ctx.socket(:PAIR)
+    rep.bind("inproc://test.socket-send_frame_dontwait")
+    req = ctx.socket(:PAIR)
+    req.connect("inproc://test.socket-send_frame_dontwait")
+    5.times do |i|
+      frame = ZMQ::Frame("m#{i}")
+      req.send_frame(frame, ZMQ::Frame::DONTWAIT)
+    end
+    expected, frames = %w(m0 m1 m2 m3 m4), []
+    5.times do
+      frames << rep.recv_frame.data
+    end
+    assert_equal expected, frames
+  ensure
+    ctx.destroy
+  end
+
   def test_send_receive_message
     ctx = ZMQ::Context.new
     rep = ctx.socket(:PAIR)
@@ -381,6 +400,14 @@ class TestZmqSocket < ZmqTestCase
     sock.reconnect_ivl_max = 5
     assert_equal 5, sock.reconnect_ivl_max
 
+    assert_equal -1, sock.rcvtimeo
+    sock.rcvtimeo = 200
+    assert_equal 200, sock.rcvtimeo
+
+    assert_equal -1, sock.sndtimeo
+    sock.sndtimeo = 200
+    assert_equal 200, sock.sndtimeo
+
     sock.identity = "anonymous"
     assert_raises ZMQ::Error do
       sock.identity = ""

data/test/test_zmq.rb

@@ -8,7 +8,7 @@ class TestZmq < ZmqTestCase
   end
 
   def test_version
-    assert_equal [2,1,11], ZMQ.version
+    assert_equal [2,2,1], ZMQ.version
   end
 
   def test_now

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rbczmq
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 4423076201732757652
   prerelease: 
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - "Lourens Naud\xC3\xA9"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-21 00:00:00 +00:00
+date: 2012-04-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +26,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 289844351982071926
         segments: 
         - 0
         - 8
@@ -159,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 2002549777813010636
       segments: 
       - 0
       version: "0"
@@ -168,14 +168,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 2002549777813010636
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: "Ruby extension for CZMQ - High-level C Binding for \xC3\x98MQ (http://czmq.zeromq.org)"