rbczmq 1.6 → 1.6.2

data/ext/rbczmq/context.h

@@ -21,6 +21,8 @@ struct nogvl_socket_args {
     int type;
 };
 
+VALUE rb_czmq_socket_alloc(VALUE context, zctx_t *ctx, void *s);
+
 void _init_rb_czmq_context();
 
 #endif

data/ext/rbczmq/frame.h

@@ -10,7 +10,7 @@
     if (!(st_lookup(frames_map, (st_data_t)frame, 0))) rb_raise(rb_eZmqError, "ZMQ::Frame instance %p has been destroyed by the ZMQ framework", (void *)obj);
 
 #define ZmqRegisterFrame(fr) \
-    zframe_freefn((fr), rb_czmq_frame_freed, NULL); \
+    zframe_freefn((fr), (zframe_free_fn *)rb_czmq_frame_freed, NULL); \
     st_insert(frames_map, (st_data_t)(fr), (st_data_t)0);
 
 void rb_czmq_free_frame(zframe_t *frame);

data/ext/rbczmq/jruby.h

@@ -1,22 +1,6 @@
 #ifndef RBCZMQ_JRUBY_H
 #define RBCZMQ_JRUBY_H
 
-#include "st.h"
-
-/* XXX */
-#define ZmqEncode(str) str
-#ifndef THREAD_PASS
-#define THREAD_PASS rb_thread_schedule();
-#endif
-
-#define TRAP_BEG
-#define TRAP_END
-
-#undef rb_errinfo
-#define rb_errinfo() (rb_gv_get("$!"))
-
-#define ZMQ_DEFAULT_SOCKET_TIMEOUT Qnil
-
-#define HAVE_RB_THREAD_BLOCKING_REGION 1
+#error Unsupported Ruby platform - this extension only works with Ruby 1.9, Ruby 2 and Rubinius
 
 #endif

data/ext/rbczmq/loop.c

@@ -84,7 +84,6 @@ ZMQ_NOINLINE static void* rb_czmq_loop_timer_callback_with_gvl(void* data)
 {
 	struct _rb_czmq_callback_invocation* invocation = (struct _rb_czmq_callback_invocation*)data;
 	zloop_t* loop = invocation->loop;
-	zmq_pollitem_t *item = invocation->item;
 	void* cb = invocation->arg;
 
     VALUE args[3];
@@ -285,10 +284,10 @@ static VALUE rb_czmq_loop_start(VALUE obj)
     int rc;
     errno = 0;
     ZmqGetLoop(obj);
-    THREAD_PASS;
+    rb_thread_schedule();
     zloop_timer(loop->loop, 1, 1, rb_czmq_loop_started_callback, loop);
 
-    rc = (int)rb_thread_call_without_gvl(rb_czmq_loop_start_nogvl, (void *)loop, rb_czmq_loop_start_ubf, (void*)loop);
+    rc = (int)rb_thread_blocking_region(rb_czmq_loop_start_nogvl, (void *)loop, rb_czmq_loop_start_ubf, (void*)loop);
 	
     if (rc > 0) rb_raise(rb_eZmqError, "internal event loop error!");
     return INT2NUM(rc);

data/ext/rbczmq/rbczmq_ext.c

@@ -32,9 +32,7 @@ VALUE intern_readable;
 VALUE intern_writable;
 VALUE intern_error;
 
-#ifdef HAVE_RUBY_ENCODING_H
 rb_encoding *binary_encoding;
-#endif
 
 /*
  *  call-seq:
@@ -180,9 +178,9 @@ static VALUE rb_czmq_m_proxy_nogvl(void* args)
  * === Examples
  *     context = ZMQ::Context.new
  *     frontend = context.socket(ZMQ::ROUTER)
- *     frontend.bind("tcp://*:5555")
+ *     frontend.bind("tcp://127.0.0.1:5555")
  *     backend = context.socket(ZMQ::DEALER)
- *     backend.bind("tcp://*:5556")
+ *     backend.bind("tcp://127.0.0.1:5556")
  *     ZMQ.proxy(frontend, backend) => -1 when interrupted
 */
 static VALUE rb_czmq_m_proxy(int argc, VALUE *argv, ZMQ_UNUSED VALUE klass)
@@ -225,9 +223,7 @@ void Init_rbczmq_ext()
     intern_writable = rb_intern("on_writable");
     intern_error = rb_intern("on_error");
 
-#ifdef HAVE_RUBY_ENCODING_H
     binary_encoding = rb_enc_find("binary");
-#endif
 
     rb_mZmq = rb_define_module("ZMQ");
 

data/ext/rbczmq/rbczmq_ext.h

@@ -16,6 +16,12 @@
 
 #include "rbczmq_prelude.h"
 
+#include <ruby/encoding.h>
+#include <ruby/io.h>
+extern rb_encoding *binary_encoding;
+#define ZmqEncode(str) rb_enc_associate(str, binary_encoding)
+
+
 #define ZmqRaiseSysError() { \
         printf("Sys error location: %s:%d\n", __FILE__,__LINE__); \
         rb_sys_fail(zmq_strerror(zmq_errno())); \

data/ext/rbczmq/rubinius.h

@@ -3,22 +3,8 @@
 
 #define RSTRING_NOT_MODIFIED
 
-#ifdef HAVE_RUBY_ENCODING_H
 #include <ruby/st.h>
-#include <ruby/encoding.h>
-#include <ruby/io.h>
-extern rb_encoding *binary_encoding;
-#define ZmqEncode(str) rb_enc_associate(str, binary_encoding)
-#else
-#include "st.h"
-#define ZmqEncode(str) str
-#endif
-
-#define TRAP_BEG
-#define TRAP_END
 
 #define ZMQ_DEFAULT_SOCKET_TIMEOUT Qnil
 
-#define THREAD_PASS rb_thread_schedule();
-
 #endif

data/ext/rbczmq/ruby18.h

@@ -1,43 +1,6 @@
 #ifndef RBCZMQ_RUBY18_H
 #define RBCZMQ_RUBY18_H
 
-#define THREAD_PASS rb_thread_schedule();
-#define ZmqEncode(str) str
-#include "rubyio.h"
-#include "rubysig.h"
-#include "st.h"
-
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(str) RSTRING(str)->ptr
-#endif
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(s) (RSTRING(s)->len)
-#endif
-
-/*
- * partial emulation of the 1.9 rb_thread_blocking_region under 1.8,
- * this is enough for dealing with blocking I/O functions in the
- * presence of threads.
- */
-
-#define RUBY_UBF_IO ((rb_unblock_function_t *)-1)
-typedef void rb_unblock_function_t(void *);
-typedef VALUE rb_blocking_function_t(void *);
-static VALUE
-rb_thread_blocking_region(
-  rb_blocking_function_t *func, void *data1,
-  ZMQ_UNUSED rb_unblock_function_t *ubf,
-  ZMQ_UNUSED void *data2)
-{
-  VALUE rv;
-  TRAP_BEG;
-  rv = func(data1);
-  TRAP_END;
-  return rv;
-}
-
-struct timeval rb_time_interval _((VALUE));
-
-#define rb_errinfo() ruby_errinfo
+#error Unsupported Ruby platform - this extension only works with Ruby 1.9, Ruby 2 and Rubinius
 
 #endif

data/ext/rbczmq/ruby19.h

@@ -1,15 +1,4 @@
 #ifndef RBCZMQ_RUBY19_H
 #define RBCZMQ_RUBY19_H
 
-#include <ruby/encoding.h>
-#include <ruby/io.h>
-extern rb_encoding *binary_encoding;
-#define ZmqEncode(str) rb_enc_associate(str, binary_encoding)
-#ifndef THREAD_PASS
-#define THREAD_PASS rb_thread_schedule();
-#endif
-
-#define TRAP_BEG
-#define TRAP_END
-
 #endif

data/ext/rbczmq/socket.c

@@ -48,7 +48,7 @@ void rb_czmq_free_sock(zmq_sock_wrapper *sock)
 void rb_czmq_mark_sock(void *ptr)
 {
     zmq_sock_wrapper *sock = (zmq_sock_wrapper *)ptr;
-    if (sock){
+    if (sock && sock->ctx){
         if (sock->verbose)
             zclock_log ("I: %s socket %p, context %p: GC mark", zsocket_type_str(sock->socket), sock, sock->ctx);
         rb_gc_mark(sock->endpoints);
@@ -68,7 +68,7 @@ void rb_czmq_mark_sock(void *ptr)
 void rb_czmq_free_sock_gc(void *ptr)
 {
     zmq_sock_wrapper *sock = (zmq_sock_wrapper *)ptr;
-    if (sock){
+    if (sock && sock->ctx){
         if (sock->verbose)
             zclock_log ("I: %s socket %p, context %p: GC free", zsocket_type_str(sock->socket), sock, sock->ctx);
 /*
@@ -76,11 +76,6 @@ void rb_czmq_free_sock_gc(void *ptr)
         #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
-        zlist_destroy(&(sock->str_buffer));
-        zlist_destroy(&(sock->frame_buffer));
-        zlist_destroy(&(sock->msg_buffer));
-#endif
         xfree(sock);
     }
 }
@@ -173,7 +168,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);
+    if (sock->state == ZMQ_SOCKET_PENDING || sock->state == ZMQ_SOCKET_DISCONNECTED) return INT2NUM(-1);
     return INT2NUM(zsocket_fd(sock->socket));
 }
 
@@ -274,6 +269,56 @@ static VALUE rb_czmq_socket_connect(VALUE obj, VALUE endpoint)
     return Qtrue;
 }
 
+/*
+ * :nodoc:
+ *  Disconnects from an endpoint while the GIL is released.
+ *
+*/
+VALUE rb_czmq_nogvl_socket_disconnect(void *ptr)
+{
+    int rc;
+    struct nogvl_conn_args *args = ptr;
+    errno = 0;
+    zmq_sock_wrapper *socket = args->socket;
+    rc = zsocket_disconnect(socket->socket, args->endpoint);
+    return (VALUE)rc;
+}
+
+/*
+ *  call-seq:
+ *     sock.disconnect("tcp://localhost:3456")   =>  boolean
+ *
+ *  Attempts to disconnect from a given endpoint.
+ *
+ * === Examples
+ *     ctx = ZMQ::Context.new
+ *     rep = ctx.socket(:REP)
+ *     port = rep.bind("tcp://localhost:*")    =>  5432
+ *     req = ctx.socket(:REQ)
+ *     req.connect("tcp://localhost:#{port}")   => true
+ *     req.disconnect("tcp://localhost:#{port}")   => true
+ *
+*/
+
+static VALUE rb_czmq_socket_disconnect(VALUE obj, VALUE endpoint)
+{
+    struct nogvl_conn_args args;
+    int rc;
+    zmq_sock_wrapper *sock = NULL;
+    GetZmqSocket(obj);
+    ZmqSockGuardCrossThread(sock);
+    Check_Type(endpoint, T_STRING);
+    args.socket = sock;
+    args.endpoint = StringValueCStr(endpoint);
+    rc = (int)rb_thread_blocking_region(rb_czmq_nogvl_socket_disconnect, (void *)&args, RUBY_UBF_IO, 0);
+    ZmqAssert(rc);
+    if (sock->verbose)
+        zclock_log ("I: %s socket %p: disconnected \"%s\"", zsocket_type_str(sock->socket), obj, StringValueCStr(endpoint));
+    sock->state = ZMQ_SOCKET_DISCONNECTED;
+    rb_ary_delete(sock->endpoints, endpoint);
+    return Qtrue;
+}
+
 /*
  *  call-seq:
  *     sock.verbose = true   =>  nil
@@ -307,20 +352,7 @@ static VALUE rb_czmq_nogvl_zstr_send(void *ptr)
     struct nogvl_send_args *args = ptr;
     errno = 0;
     zmq_sock_wrapper *socket = args->socket;
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
     return (VALUE)zstr_send(socket->socket, args->msg);
-#else
-    if (rb_thread_alone()) return (VALUE)zstr_send(socket->socket, args->msg);
-try_writable:
-    if ((zsocket_events(socket->socket) & ZMQ_POLLOUT) == ZMQ_POLLOUT) {
-        return (VALUE)zstr_send(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
 }
 
 /*
@@ -333,20 +365,7 @@ static VALUE rb_czmq_nogvl_zstr_sendm(void *ptr)
     struct nogvl_send_args *args = ptr;
     errno = 0;
     zmq_sock_wrapper *socket = args->socket;
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
     return (VALUE)zstr_sendm(socket->socket, args->msg);
-#else
-    if (rb_thread_alone()) return (VALUE)zstr_sendm(socket->socket, args->msg);
-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;
-    }
-#endif
 }
 
 /*
@@ -424,24 +443,7 @@ static VALUE rb_czmq_nogvl_recv(void *ptr)
     struct nogvl_recv_args *args = ptr;
     errno = 0;
     zmq_sock_wrapper *socket = args->socket;
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
     return (VALUE)zstr_recv(socket->socket);
-#else
-    if (zlist_size(socket->str_buffer) != 0)
-       return (VALUE)zlist_pop(socket->str_buffer);
-try_readable:
-    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(zsocket_fd(socket->socket));
-        if (zsocket_rcvtimeo(socket->socket) != -1)
-            return zstr_recv(socket->socket);
-        goto try_readable;
-     }
-#endif
 }
 
 /*
@@ -521,18 +523,7 @@ static VALUE rb_czmq_nogvl_send_frame(void *ptr)
     struct nogvl_send_frame_args *args = ptr;
     errno = 0;
     zmq_sock_wrapper *socket = args->socket;
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
     return (VALUE)zframe_send(&(args->frame), socket->socket, args->flags);
-#else
-    if (rb_thread_alone()) return (VALUE)zframe_send(&(args->frame), socket->socket, args->flags);
-try_writable:
-    if ((zsocket_events(socket->socket) & ZMQ_POLLOUT) == ZMQ_POLLOUT) {
-        return (VALUE)zframe_send(&(args->frame), socket->socket, args->flags);
-    } else {
-        rb_thread_wait_fd(zsocket_fd(socket->socket));
-        goto try_writable;
-    }
-#endif
 }
 
 /*
@@ -599,21 +590,7 @@ static VALUE rb_czmq_nogvl_send_message(void *ptr)
     struct nogvl_send_message_args *args = ptr;
     zmq_sock_wrapper *socket = args->socket;
     errno = 0;
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
     zmsg_send(&(args->message), socket->socket);
-#else
-    if (rb_thread_alone()) {
-        zmsg_send(&(args->message), socket->socket);
-        return Qnil;
-    }
-try_writable:
-    if ((zsocket_events(socket->socket) & ZMQ_POLLOUT) == ZMQ_POLLOUT) {
-        zmsg_send(&(args->message), socket->socket);
-    } else {
-        rb_thread_wait_fd(zsocket_fd(socket->socket));
-        goto try_writable;
-    }
-#endif
     return Qnil;
 }
 
@@ -661,22 +638,7 @@ static VALUE rb_czmq_nogvl_recv_frame(void *ptr)
     struct nogvl_recv_args *args = ptr;
     errno = 0;
     zmq_sock_wrapper *socket = args->socket;
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
     return (VALUE)zframe_recv(socket->socket);
-#else
-    if (zlist_size(socket->frame_buffer) != 0)
-       return (VALUE)zlist_pop(socket->frame_buffer);
-try_readable:
-    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(zsocket_fd(socket->socket));
-        goto try_readable;
-     }
-#endif
 }
 
 /*
@@ -756,22 +718,7 @@ static VALUE rb_czmq_nogvl_recv_message(void *ptr)
     struct nogvl_recv_args *args = ptr;
     errno = 0;
     zmq_sock_wrapper *socket = args->socket;
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
     return (VALUE)zmsg_recv(socket->socket);
-#else
-    if (zlist_size(socket->msg_buffer) != 0)
-       return (VALUE)zlist_pop(socket->msg_buffer);
-try_readable:
-    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(zsocket_fd(socket->socket));
-        goto try_readable;
-     }
-#endif
 }
 
 /*
@@ -803,89 +750,46 @@ static VALUE rb_czmq_socket_recv_message(VALUE obj)
     return rb_czmq_alloc_message(message);
 }
 
-#if ZMQ_VERSION_MAJOR == 2
-
 /*
- *  call-seq:
- *     sock.hwm =>  Fixnum
- *
- *  Returns the socket HWM (High Water Mark) value.
- *
- * === Examples
- *     ctx = ZMQ::Context.new
- *     sock = ctx.socket(:REP)
- *     sock.hwm  =>  0
- *
-*/
-
-static VALUE rb_czmq_socket_opt_hwm(VALUE obj)
-{
-    zmq_sock_wrapper *sock = NULL;
-    GetZmqSocket(obj);
-    return INT2NUM(zsocket_hwm(sock->socket));
-}
-
-/*
- *  call-seq:
- *     sock.hwm = 100 =>  nil
- *
- *  Sets the socket HWM (High Water Mark() value.
- *
- * === Examples
- *     ctx = ZMQ::Context.new
- *     sock = ctx.socket(:REP)
- *     sock.hwm = 100  =>  nil
- *     sock.hwm  =>  100
+ * :nodoc:
+ *  Poll for input while the GIL is released.
  *
 */
-
-static VALUE rb_czmq_socket_set_opt_hwm(VALUE obj, VALUE value)
+static VALUE rb_czmq_nogvl_poll(void *ptr)
 {
-    zmq_sock_wrapper *sock = NULL;
-    ZmqSetSockOpt(obj, zsocket_set_hwm, "HWM", value);
+    struct nogvl_socket_poll_args *args = ptr;
+    zmq_sock_wrapper *socket = args->socket;
+    return (VALUE)zsocket_poll(socket->socket, args->timeout);
 }
 
 /*
  *  call-seq:
- *     sock.swap =>  Fixnum
+ *     sock.poll(100) =>  Boolean
  *
- *  Returns the socket SWAP value.
+ *  Poll for input events on the socket. Returns true if there is input, otherwise false.
  *
  * === Examples
  *     ctx = ZMQ::Context.new
  *     sock = ctx.socket(:REP)
- *     sock.swap  =>  0
+ *     sock.bind("inproc://test")
+ *     sock.poll(100)  =>  true
  *
 */
 
-static VALUE rb_czmq_socket_opt_swap(VALUE obj)
+static VALUE rb_czmq_socket_poll(VALUE obj, VALUE timeout)
 {
+    bool readable;
+    struct nogvl_socket_poll_args args;
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return INT2NUM(zsocket_swap(sock->socket));
-}
-
-/*
- *  call-seq:
- *     sock.swap = 100 =>  nil
- *
- *  Sets the socket SWAP value.
- *
- * === Examples
- *     ctx = ZMQ::Context.new
- *     sock = ctx.socket(:REP)
- *     sock.swap = 100  =>  nil
- *
-*/
-
-static VALUE rb_czmq_socket_set_opt_swap(VALUE obj, VALUE value)
-{
-    zmq_sock_wrapper *sock = NULL;
-    ZmqSetSockOpt(obj, zsocket_set_swap, "SWAP", value);
+    Check_Type(timeout, T_FIXNUM);
+    ZmqSockGuardCrossThread(sock);
+    args.socket = sock;
+    args.timeout = FIX2INT(timeout);
+    readable = (bool)rb_thread_blocking_region(rb_czmq_nogvl_poll, (void *)&args, RUBY_UBF_IO, 0);
+    return (readable == true) ? Qtrue : Qfalse;
 }
-#endif
 
-#if ZMQ_VERSION_MAJOR == 3
 /*
  *  call-seq:
  *     sock.sndhwm =>  Fixnum
@@ -965,7 +869,6 @@ static VALUE rb_czmq_socket_set_opt_rcvhwm(VALUE obj, VALUE value)
     zmq_sock_wrapper *sock = NULL;
     ZmqSetSockOpt(obj, zsocket_set_rcvhwm, "RCVHWM", value);
 }
-#endif
 
 /*
  *  call-seq:
@@ -1084,85 +987,200 @@ static VALUE rb_czmq_socket_set_opt_recovery_ivl(VALUE obj, VALUE value)
     ZmqSetSockOpt(obj, zsocket_set_recovery_ivl, "RECOVERY_IVL", value);
 }
 
-#if ZMQ_VERSION_MAJOR == 2
 /*
  *  call-seq:
- *     sock.recovery_ivl_msec =>  Fixnum
+ *     sock.maxmsgsize =>  Fixnum
  *
- *  Returns the socket RECOVERY_IVL_MSEC value.
+ *  Returns the socket MAXMSGSIZE value.
  *
  * === Examples
  *     ctx = ZMQ::Context.new
  *     sock = ctx.socket(:REP)
- *     sock.recovery_ivl_msec  =>  -1
+ *     sock.maxmsgsize  =>  10
  *
 */
 
-static VALUE rb_czmq_socket_opt_recovery_ivl_msec(VALUE obj)
+static VALUE rb_czmq_socket_opt_maxmsgsize(VALUE obj)
 {
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return INT2NUM(zsocket_recovery_ivl_msec(sock->socket));
+    return INT2NUM(zsocket_maxmsgsize(sock->socket));
 }
 
 /*
  *  call-seq:
- *     sock.recovery_ivl_msec = 20 =>  nil
+ *     sock.maxmsgsize = 20 =>  nil
  *
- *  Sets the socket RECOVERY_IVL_MSEC value.
+ *  Sets the socket MAXMSGSIZE value.
  *
  * === Examples
  *     ctx = ZMQ::Context.new
  *     sock = ctx.socket(:REP)
- *     sock.recovery_ivl_msec = 20  =>  nil
+ *     sock.maxmsgsize = 20  =>  nil
  *
 */
 
-static VALUE rb_czmq_socket_set_opt_recovery_ivl_msec(VALUE obj, VALUE value)
+static VALUE rb_czmq_socket_set_opt_maxmsgsize(VALUE obj, VALUE value)
 {
     zmq_sock_wrapper *sock = NULL;
-    ZmqSetSockOpt(obj, zsocket_set_recovery_ivl_msec, "RECOVERY_IVL_MSEC", value);
+    ZmqSetSockOpt(obj, zsocket_set_maxmsgsize, "MAXMSGSIZE", value);
 }
 
 /*
  *  call-seq:
- *     sock.mcast_loop? =>  boolean
+ *     sock.multicast_hops =>  Fixnum
  *
- *  Returns the socket MCAST_LOOP status.
+ *  Returns the socket MULTICAST_HOPS value.
  *
  * === Examples
  *     ctx = ZMQ::Context.new
  *     sock = ctx.socket(:REP)
- *     sock.mcast_loop?  =>  true
+ *     sock.multicast_hops  =>  10
  *
 */
 
-static VALUE rb_czmq_socket_opt_mcast_loop(VALUE obj)
+static VALUE rb_czmq_socket_opt_multicast_hops(VALUE obj)
 {
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return (zsocket_mcast_loop(sock->socket) == 1) ? Qtrue : Qfalse;
+    return INT2NUM(zsocket_multicast_hops(sock->socket));
 }
 
 /*
  *  call-seq:
- *     sock.mcast_loop = false =>  nil
+ *     sock.multicast_hops = 20 =>  nil
  *
- *  Sets the socket MCAST_LOOP value.
+ *  Sets the socket MULTICAST_HOPS value.
  *
  * === Examples
  *     ctx = ZMQ::Context.new
  *     sock = ctx.socket(:REP)
- *     sock.mcast_loop = false  =>  nil
+ *     sock.multicast_hops = 20  =>  nil
  *
 */
 
-static VALUE rb_czmq_socket_set_opt_mcast_loop(VALUE obj, VALUE value)
+static VALUE rb_czmq_socket_set_opt_multicast_hops(VALUE obj, VALUE value)
 {
     zmq_sock_wrapper *sock = NULL;
-    ZmqSetBooleanSockOpt(obj, zsocket_set_mcast_loop, "MCAST_LOOP", value);
+    ZmqSetSockOpt(obj, zsocket_set_multicast_hops, "MULTICAST_HOPS", value);
+}
+
+/*
+ *  call-seq:
+ *     sock.ipv4only =>  Boolean
+ *
+ *  Returns the socket IPV4ONLY value.
+ *
+ * === Examples
+ *     ctx = ZMQ::Context.new
+ *     sock = ctx.socket(:REP)
+ *     sock.ipv4only  =>  false
+ *
+*/
+
+static VALUE rb_czmq_socket_opt_ipv4only(VALUE obj)
+{
+    int ipv4only;
+    zmq_sock_wrapper *sock = NULL;
+    GetZmqSocket(obj);
+    ipv4only = zsocket_ipv4only(sock->socket);
+    return (ipv4only == 0 ? Qfalse : Qtrue);
+}
+
+/*
+ *  call-seq:
+ *     sock.ipv4only = true =>  nil
+ *
+ *  Sets the socket IPV4ONLY value.
+ *
+ * === Examples
+ *     ctx = ZMQ::Context.new
+ *     sock = ctx.socket(:REP)
+ *     sock.ipv4only = true  =>  nil
+ *
+*/
+
+static VALUE rb_czmq_socket_set_opt_ipv4only(VALUE obj, VALUE value)
+{
+    zmq_sock_wrapper *sock = NULL;
+    ZmqSetBooleanSockOpt(obj, zsocket_set_ipv4only, "IPV4ONLY", value);
+}
+
+/*
+ *  call-seq:
+ *     sock.delay_attach_on_connect = true =>  nil
+ *
+ *  Sets the socket DELAY_ATTACH_ON_CONNECT value.
+ *
+ * === Examples
+ *     ctx = ZMQ::Context.new
+ *     sock = ctx.socket(:REP)
+ *     sock.delay_attach_on_connect = true  =>  nil
+ *
+*/
+
+static VALUE rb_czmq_socket_set_opt_delay_attach_on_connect(VALUE obj, VALUE value)
+{
+    zmq_sock_wrapper *sock = NULL;
+    ZmqSetBooleanSockOpt(obj, zsocket_set_delay_attach_on_connect, "DELAY_ATTACH_ON_CONNECT", value);
+}
+
+/*
+ *  call-seq:
+ *     sock.router_mandatory = true =>  nil
+ *
+ *  Sets the socket ROUTER_MANDATORY value.
+ *
+ * === Examples
+ *     ctx = ZMQ::Context.new
+ *     sock = ctx.socket(:REP)
+ *     sock.router_mandatory = true  =>  nil
+ *
+*/
+
+static VALUE rb_czmq_socket_set_opt_router_mandatory(VALUE obj, VALUE value)
+{
+    zmq_sock_wrapper *sock = NULL;
+    ZmqSetBooleanSockOpt(obj, zsocket_set_router_mandatory, "ROUTER_MANDATORY", value);
+}
+
+/*
+ *  call-seq:
+ *     sock.router_raw= true =>  nil
+ *
+ *  Sets the socket ROUTER_RAW value.
+ *
+ * === Examples
+ *     ctx = ZMQ::Context.new
+ *     sock = ctx.socket(:REP)
+ *     sock.router_raw = true  =>  nil
+ *
+*/
+
+static VALUE rb_czmq_socket_set_opt_router_raw(VALUE obj, VALUE value)
+{
+    zmq_sock_wrapper *sock = NULL;
+    ZmqSetBooleanSockOpt(obj, zsocket_set_router_raw, "ROUTER_RAW", value);
+}
+
+/*
+ *  call-seq:
+ *     sock.xpub_verbose = true =>  nil
+ *
+ *  Sets the socket XPUB_VERBOSE value.
+ *
+ * === Examples
+ *     ctx = ZMQ::Context.new
+ *     sock = ctx.socket(:REP)
+ *     sock.xpub_verbose = true  =>  nil
+ *
+*/
+
+static VALUE rb_czmq_socket_set_opt_xpub_verbose(VALUE obj, VALUE value)
+{
+    zmq_sock_wrapper *sock = NULL;
+    ZmqSetBooleanSockOpt(obj, zsocket_set_xpub_verbose, "XPUB_VERBOSE", value);
 }
-#endif
 
 /*
  *  call-seq:
@@ -1587,27 +1605,6 @@ static VALUE rb_czmq_socket_set_opt_sndtimeo(VALUE obj, VALUE value)
     ZmqSetSockOpt(obj, zsocket_set_sndtimeo, "SNDTIMEO", value);
 }
 
-#if defined (ZMQ_ROUTER_RAW)
-/*
- *  call-seq:
- *     sock.raw = true =>  nil
- *
- *  Define this as a RAW socket - applicable to ROUTER sockets only.
- *
- * === Examples
- *     ctx = ZMQ::Context.new
- *     sock = ctx.socket(:ROUTER)
- *     sock.router = 200  =>  nil
- *
-*/
-
-static VALUE rb_czmq_socket_set_opt_raw(VALUE obj, VALUE value)
-{
-    zmq_sock_wrapper *sock = NULL;
-    ZmqSetBooleanSockOpt(obj, zsocket_set_router_raw, "ROUTER_RAW", value);
-}
-#endif
-
 /*
  * :nodoc:
  *  Receives a monitoring event message while the GIL is released.
@@ -1618,20 +1615,7 @@ static VALUE rb_czmq_nogvl_monitor_recv(void *ptr)
 {
     struct nogvl_monitor_recv_args *args = ptr;
     int rc;
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
     rc = zmq_recvmsg (args->socket, &args->msg, 0);
-#else
-    int fd;
-    size_t option_len = sizeof (int);
-    zmq_getsockopt (args->socket, ZMQ_FD, &fd, &option_len);
-try_readable:
-    if ((zsocket_events(args->socket) & ZMQ_POLLIN) == ZMQ_POLLIN) {
-        rc = zmq_recvmsg (args->socket, &args->msg, 0);
-     } else {
-        rb_thread_wait_fd(fd);
-        goto try_readable;
-     }
-#endif
     return (VALUE)rc;
 }
 
@@ -1654,7 +1638,7 @@ static VALUE rb_czmq_socket_monitor_thread(void *arg)
     rc = zmq_connect (s, StringValueCStr(sock->monitor_endpoint));
     assert (rc == 0);
 
-    THREAD_PASS;
+    rb_thread_schedule();
 
     while (1) {
         args.socket = s;
@@ -1729,7 +1713,6 @@ static VALUE rb_czmq_socket_monitor(int argc, VALUE *argv, VALUE obj)
         sock->monitor_endpoint = endpoint;
         sock->monitor_handler = handler;
         sock->monitor_thread = rb_thread_create(rb_czmq_socket_monitor_thread, (void*)sock);
-        rb_thread_run(sock->monitor_thread);
         return Qtrue;
     } else {
         return Qfalse;
@@ -1765,12 +1748,14 @@ void _init_rb_czmq_socket()
     rb_define_const(rb_cZmqSocket, "PENDING", INT2NUM(ZMQ_SOCKET_PENDING));
     rb_define_const(rb_cZmqSocket, "BOUND", INT2NUM(ZMQ_SOCKET_BOUND));
     rb_define_const(rb_cZmqSocket, "CONNECTED", INT2NUM(ZMQ_SOCKET_CONNECTED));
+    rb_define_const(rb_cZmqSocket, "DISCONNECTED", INT2NUM(ZMQ_SOCKET_DISCONNECTED));
 
     rb_define_method(rb_cZmqSocket, "close", rb_czmq_socket_close, 0);
     rb_define_method(rb_cZmqSocket, "endpoints", rb_czmq_socket_endpoints, 0);
     rb_define_method(rb_cZmqSocket, "state", rb_czmq_socket_state, 0);
     rb_define_method(rb_cZmqSocket, "real_bind", rb_czmq_socket_bind, 1);
     rb_define_method(rb_cZmqSocket, "real_connect", rb_czmq_socket_connect, 1);
+    rb_define_method(rb_cZmqSocket, "disconnect", rb_czmq_socket_disconnect, 1);
     rb_define_method(rb_cZmqSocket, "fd", rb_czmq_socket_fd, 0);
     rb_define_alias(rb_cZmqSocket, "to_i", "fd");
     rb_define_method(rb_cZmqSocket, "verbose=", rb_czmq_socket_set_verbose, 1);
@@ -1783,35 +1768,28 @@ 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, "poll", rb_czmq_socket_poll, 1);
 
-#if ZMQ_VERSION_MAJOR == 2
-    rb_define_method(rb_cZmqSocket, "swap", rb_czmq_socket_opt_swap, 0);
-    rb_define_method(rb_cZmqSocket, "swap=", rb_czmq_socket_set_opt_swap, 1);
-    rb_define_method(rb_cZmqSocket, "recovery_ivl_msec", rb_czmq_socket_opt_recovery_ivl_msec, 0);
-    rb_define_method(rb_cZmqSocket, "recovery_ivl_msec=", rb_czmq_socket_set_opt_recovery_ivl_msec, 1);
-    rb_define_method(rb_cZmqSocket, "mcast_loop?", rb_czmq_socket_opt_mcast_loop, 0);
-    rb_define_method(rb_cZmqSocket, "mcast_loop=", rb_czmq_socket_set_opt_mcast_loop, 1);
-    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);
-#endif
-
-#if ZMQ_VERSION_MAJOR == 3
     rb_define_method(rb_cZmqSocket, "sndhwm", rb_czmq_socket_opt_sndhwm, 0);
     rb_define_method(rb_cZmqSocket, "sndhwm=", rb_czmq_socket_set_opt_sndhwm, 1);
     rb_define_method(rb_cZmqSocket, "rcvhwm", rb_czmq_socket_opt_rcvhwm, 0);
     rb_define_method(rb_cZmqSocket, "rcvhwm=", rb_czmq_socket_set_opt_rcvhwm, 1);
-
-#if defined (ZMQ_ROUTER_RAW)
-    rb_define_method(rb_cZmqSocket, "raw=", rb_czmq_socket_set_opt_raw, 1);
-#endif
-#endif
-
     rb_define_method(rb_cZmqSocket, "affinity", rb_czmq_socket_opt_affinity, 0);
     rb_define_method(rb_cZmqSocket, "affinity=", rb_czmq_socket_set_opt_affinity, 1);
     rb_define_method(rb_cZmqSocket, "rate", rb_czmq_socket_opt_rate, 0);
     rb_define_method(rb_cZmqSocket, "rate=", rb_czmq_socket_set_opt_rate, 1);
     rb_define_method(rb_cZmqSocket, "recovery_ivl", rb_czmq_socket_opt_recovery_ivl, 0);
     rb_define_method(rb_cZmqSocket, "recovery_ivl=", rb_czmq_socket_set_opt_recovery_ivl, 1);
+    rb_define_method(rb_cZmqSocket, "maxmsgsize", rb_czmq_socket_opt_maxmsgsize, 0);
+    rb_define_method(rb_cZmqSocket, "maxmsgsize=", rb_czmq_socket_set_opt_maxmsgsize, 1);
+    rb_define_method(rb_cZmqSocket, "multicast_hops", rb_czmq_socket_opt_multicast_hops, 0);
+    rb_define_method(rb_cZmqSocket, "multicast_hops=", rb_czmq_socket_set_opt_multicast_hops, 1);
+    rb_define_method(rb_cZmqSocket, "ipv4only?", rb_czmq_socket_opt_ipv4only, 0);
+    rb_define_method(rb_cZmqSocket, "ipv4only=", rb_czmq_socket_set_opt_ipv4only, 1);
+    rb_define_method(rb_cZmqSocket, "delay_attach_on_connect=", rb_czmq_socket_set_opt_delay_attach_on_connect, 1);
+    rb_define_method(rb_cZmqSocket, "router_mandatory=", rb_czmq_socket_set_opt_router_mandatory, 1);
+    rb_define_method(rb_cZmqSocket, "router_raw=", rb_czmq_socket_set_opt_router_raw, 1);
+    rb_define_method(rb_cZmqSocket, "xpub_verbose=", rb_czmq_socket_set_opt_xpub_verbose, 1);
     rb_define_method(rb_cZmqSocket, "sndbuf", rb_czmq_socket_opt_sndbuf, 0);
     rb_define_method(rb_cZmqSocket, "sndbuf=", rb_czmq_socket_set_opt_sndbuf, 1);
     rb_define_method(rb_cZmqSocket, "rcvbuf", rb_czmq_socket_opt_rcvbuf, 0);