rbczmq 1.7.4 → 1.7.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWI3ZDU3NzMwMTQ5NzEwYTY1MzkwYzA3NmQzYmY2YjE5YzI0NmM5MQ==
-  data.tar.gz: !binary |-
-    ZTlhN2Q2NzM1NzYxZjNlMjEzOWM3ZTVkNmYyM2FiMmQzYzE2NzIyYQ==
+SHA1:
+  metadata.gz: 8ed671d96b6cc24a8815580b90a9fa972abc37ea
+  data.tar.gz: 9442f2bf13c7fd885656efabc7b46dc51ad0d1b6
 SHA512:
-  metadata.gz: !binary |-
-    MzEzNjBiMTI2YmI3MGZkYjcyNjkzY2I1ODA2YWRhYzRjZGQ2ZTUzMzNkNzk4
-    MmQzNWIxMTExOTkwNWU4NzI3ZjZkNmVlOTVjY2U0MDE4MWQzMTYxNDhjMmU4
-    NjIyODg0ZGMxMjdjZWRmZjExOWMyZTA2OTAyNDY5ZTcyMmJkMDk=
-  data.tar.gz: !binary |-
-    Mzg3MDk5M2E1MjIwOGU3Yjg2NjlkMWZlMGNmYjM2NDE2NWQ5MTM2N2RhM2Y1
-    NTJiMDNiMTUyNTk0ZGM2ODRmYjc0YTE0NTA1MmRhZGU2NDM3NzY2OTA0NDEx
-    MGYxNTk1OGE1N2VmYzJhODdjNGE4MTFjMzRhMjBlZmNhMWJlYjg=
+  metadata.gz: 7b69981b46f42fa30476b3cb35036c24f0a33b7fa896b720fdda085fa4652fcb6a2107b936d9b94d2bab84b3bb02d3f16fcb044fe688a48389ad976acf429451
+  data.tar.gz: 53303923c66106bb2a17eea84c958b87106cf2d745af310bb19d30c2a3473b15acb5b6bbc7aa687fc0504ab8a858757241ce30ff31053b9b45c35d08397075e9

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
+bundler_args: --quiet
 rvm:
-  - rbx-19mode
+  - rbx-2
   - 1.9.3
   - 2.0.0
   - ruby-head
@@ -14,6 +15,8 @@ notifications:
 branches:
   only:
     - master
+before_install:
+  - if [[ $(ruby -v) =~ rubinius ]]; then travis_retry gem install rubysl; fi; gem list; true
 matrix:
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.rdoc

@@ -1,5 +1,18 @@
 = Changelog
 
+== 1.7.5 (January 17, 2014)
+
+* Update to ZMQ 4.0.3. This fixes several bugs, incluing: https://github.com/zeromq/libzmq/issues/769
+* Fix ZMQ::Poller#poll handling of signals (INT/TERM)
+* Fix several cases where Ruby strings with NUL characters in them would have been truncated as C strings when sent in ZMQ messages.
+* Updates Gemfile to support rubinius 2.
+* Add ZMQ::Socket#unbind method. Has same affect as disconnect, but matches semantics of bind, as per other bindings.
+* Update ZMQ::Socket state to only become disconnected after all connected/bound endpoints are removed with disconnect/unbind.
+* Fix ZMQ::Socket connect/bind bug with percent symbols in the address URI.
+* Add ZMQ::Socket#last_endpoint for retrieving the string URI with an ephemeral port number filled in.
+* Add STREAM socket type, using ruby class ZMQ::Socket::Stream.
+* Fix ZMQ::Socket implicit close when garbage collected.
+
 == 1.7.4 (November 25, 2013)
 
 * 	Update ZMQ::Socket to support strings with null bytes in them (Matt Connolly)

data/Gemfile

@@ -3,4 +3,11 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
-gem 'rdoc'
+gem 'rdoc'
+
+# required for testing rubinius on travis:
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'minitest', '~> 4.7'
+  gem 'rubysl-test-unit', '~> 2.0'
+end

data/Gemfile.lock

@@ -6,18 +6,227 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    ffi2-generators (0.1.1)
     json (1.8.1)
-    rake (10.1.0)
+    minitest (4.7.5)
+    rake (10.1.1)
     rake-compiler (0.8.3)
       rake
-    rdoc (4.0.1)
+    rdoc (4.1.0)
       json (~> 1.4)
+    rubysl (2.0.15)
+      rubysl-abbrev (~> 2.0)
+      rubysl-base64 (~> 2.0)
+      rubysl-benchmark (~> 2.0)
+      rubysl-bigdecimal (~> 2.0)
+      rubysl-cgi (~> 2.0)
+      rubysl-cgi-session (~> 2.0)
+      rubysl-cmath (~> 2.0)
+      rubysl-complex (~> 2.0)
+      rubysl-continuation (~> 2.0)
+      rubysl-coverage (~> 2.0)
+      rubysl-csv (~> 2.0)
+      rubysl-curses (~> 2.0)
+      rubysl-date (~> 2.0)
+      rubysl-delegate (~> 2.0)
+      rubysl-digest (~> 2.0)
+      rubysl-drb (~> 2.0)
+      rubysl-e2mmap (~> 2.0)
+      rubysl-english (~> 2.0)
+      rubysl-enumerator (~> 2.0)
+      rubysl-erb (~> 2.0)
+      rubysl-etc (~> 2.0)
+      rubysl-expect (~> 2.0)
+      rubysl-fcntl (~> 2.0)
+      rubysl-fiber (~> 2.0)
+      rubysl-fileutils (~> 2.0)
+      rubysl-find (~> 2.0)
+      rubysl-forwardable (~> 2.0)
+      rubysl-getoptlong (~> 2.0)
+      rubysl-gserver (~> 2.0)
+      rubysl-io-console (~> 2.0)
+      rubysl-io-nonblock (~> 2.0)
+      rubysl-io-wait (~> 2.0)
+      rubysl-ipaddr (~> 2.0)
+      rubysl-irb (~> 2.0)
+      rubysl-logger (~> 2.0)
+      rubysl-mathn (~> 2.0)
+      rubysl-matrix (~> 2.0)
+      rubysl-mkmf (~> 2.0)
+      rubysl-monitor (~> 2.0)
+      rubysl-mutex_m (~> 2.0)
+      rubysl-net-ftp (~> 2.0)
+      rubysl-net-http (~> 2.0)
+      rubysl-net-imap (~> 2.0)
+      rubysl-net-pop (~> 2.0)
+      rubysl-net-protocol (~> 2.0)
+      rubysl-net-smtp (~> 2.0)
+      rubysl-net-telnet (~> 2.0)
+      rubysl-nkf (~> 2.0)
+      rubysl-observer (~> 2.0)
+      rubysl-open-uri (~> 2.0)
+      rubysl-open3 (~> 2.0)
+      rubysl-openssl (~> 2.0)
+      rubysl-optparse (~> 2.0)
+      rubysl-ostruct (~> 2.0)
+      rubysl-pathname (~> 2.0)
+      rubysl-prettyprint (~> 2.0)
+      rubysl-prime (~> 2.0)
+      rubysl-profile (~> 2.0)
+      rubysl-profiler (~> 2.0)
+      rubysl-pstore (~> 2.0)
+      rubysl-pty (~> 2.0)
+      rubysl-rational (~> 2.0)
+      rubysl-readline (~> 2.0)
+      rubysl-resolv (~> 2.0)
+      rubysl-rexml (~> 2.0)
+      rubysl-rinda (~> 2.0)
+      rubysl-rss (~> 2.0)
+      rubysl-scanf (~> 2.0)
+      rubysl-securerandom (~> 2.0)
+      rubysl-set (~> 2.0)
+      rubysl-shellwords (~> 2.0)
+      rubysl-singleton (~> 2.0)
+      rubysl-socket (~> 2.0)
+      rubysl-stringio (~> 2.0)
+      rubysl-strscan (~> 2.0)
+      rubysl-sync (~> 2.0)
+      rubysl-syslog (~> 2.0)
+      rubysl-tempfile (~> 2.0)
+      rubysl-thread (~> 2.0)
+      rubysl-thwait (~> 2.0)
+      rubysl-time (~> 2.0)
+      rubysl-timeout (~> 2.0)
+      rubysl-tmpdir (~> 2.0)
+      rubysl-tsort (~> 2.0)
+      rubysl-un (~> 2.0)
+      rubysl-uri (~> 2.0)
+      rubysl-weakref (~> 2.0)
+      rubysl-webrick (~> 2.0)
+      rubysl-xmlrpc (~> 2.0)
+      rubysl-yaml (~> 2.0)
+      rubysl-zlib (~> 2.0)
+    rubysl-abbrev (2.0.4)
+    rubysl-base64 (2.0.0)
+    rubysl-benchmark (2.0.1)
+    rubysl-bigdecimal (2.0.2)
+    rubysl-cgi (2.0.1)
+    rubysl-cgi-session (2.0.1)
+    rubysl-cmath (2.0.0)
+    rubysl-complex (2.0.0)
+    rubysl-continuation (2.0.0)
+    rubysl-coverage (2.0.3)
+    rubysl-csv (2.0.2)
+      rubysl-english (~> 2.0)
+    rubysl-curses (2.0.1)
+    rubysl-date (2.0.6)
+    rubysl-delegate (2.0.1)
+    rubysl-digest (2.0.3)
+    rubysl-drb (2.0.1)
+    rubysl-e2mmap (2.0.0)
+    rubysl-english (2.0.0)
+    rubysl-enumerator (2.0.0)
+    rubysl-erb (2.0.1)
+    rubysl-etc (2.0.3)
+      ffi2-generators (~> 0.1)
+    rubysl-expect (2.0.0)
+    rubysl-fcntl (2.0.4)
+      ffi2-generators (~> 0.1)
+    rubysl-fiber (2.0.0)
+    rubysl-fileutils (2.0.3)
+    rubysl-find (2.0.1)
+    rubysl-forwardable (2.0.1)
+    rubysl-getoptlong (2.0.0)
+    rubysl-gserver (2.0.0)
+      rubysl-socket (~> 2.0)
+      rubysl-thread (~> 2.0)
+    rubysl-io-console (2.0.0)
+    rubysl-io-nonblock (2.0.0)
+    rubysl-io-wait (2.0.0)
+    rubysl-ipaddr (2.0.0)
+    rubysl-irb (2.0.4)
+      rubysl-e2mmap (~> 2.0)
+      rubysl-mathn (~> 2.0)
+      rubysl-readline (~> 2.0)
+      rubysl-thread (~> 2.0)
+    rubysl-logger (2.0.0)
+    rubysl-mathn (2.0.0)
+    rubysl-matrix (2.1.0)
+      rubysl-e2mmap (~> 2.0)
+    rubysl-mkmf (2.0.1)
+      rubysl-fileutils (~> 2.0)
+      rubysl-shellwords (~> 2.0)
+    rubysl-monitor (2.0.0)
+    rubysl-mutex_m (2.0.0)
+    rubysl-net-ftp (2.0.1)
+    rubysl-net-http (2.0.4)
+      rubysl-cgi (~> 2.0)
+      rubysl-erb (~> 2.0)
+      rubysl-singleton (~> 2.0)
+    rubysl-net-imap (2.0.1)
+    rubysl-net-pop (2.0.1)
+    rubysl-net-protocol (2.0.1)
+    rubysl-net-smtp (2.0.1)
+    rubysl-net-telnet (2.0.0)
+    rubysl-nkf (2.0.1)
+    rubysl-observer (2.0.0)
+    rubysl-open-uri (2.0.0)
+    rubysl-open3 (2.0.0)
+    rubysl-openssl (2.0.5)
+    rubysl-optparse (2.0.1)
+      rubysl-shellwords (~> 2.0)
+    rubysl-ostruct (2.0.4)
+    rubysl-pathname (2.0.0)
+    rubysl-prettyprint (2.0.2)
+    rubysl-prime (2.0.1)
+    rubysl-profile (2.0.0)
+    rubysl-profiler (2.0.1)
+    rubysl-pstore (2.0.0)
+    rubysl-pty (2.0.2)
+    rubysl-rational (2.0.1)
+    rubysl-readline (2.0.2)
+    rubysl-resolv (2.0.0)
+    rubysl-rexml (2.0.2)
+    rubysl-rinda (2.0.0)
+    rubysl-rss (2.0.0)
+    rubysl-scanf (2.0.0)
+    rubysl-securerandom (2.0.0)
+    rubysl-set (2.0.1)
+    rubysl-shellwords (2.0.0)
+    rubysl-singleton (2.0.0)
+    rubysl-socket (2.0.1)
+    rubysl-stringio (2.0.0)
+    rubysl-strscan (2.0.0)
+    rubysl-sync (2.0.0)
+    rubysl-syslog (2.0.1)
+      ffi2-generators (~> 0.1)
+    rubysl-tempfile (2.0.1)
+    rubysl-test-unit (2.0.3)
+      minitest (~> 4.7)
+    rubysl-thread (2.0.2)
+    rubysl-thwait (2.0.0)
+    rubysl-time (2.0.3)
+    rubysl-timeout (2.0.0)
+    rubysl-tmpdir (2.0.0)
+    rubysl-tsort (2.0.1)
+    rubysl-un (2.0.0)
+      rubysl-fileutils (~> 2.0)
+      rubysl-optparse (~> 2.0)
+    rubysl-uri (2.0.0)
+    rubysl-weakref (2.0.0)
+    rubysl-webrick (2.0.0)
+    rubysl-xmlrpc (2.0.0)
+    rubysl-yaml (2.0.4)
+    rubysl-zlib (2.0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  minitest (~> 4.7)
   rake
   rake-compiler (~> 0.8.0)
   rbczmq!
   rdoc
+  rubysl (~> 2.0)
+  rubysl-test-unit (~> 2.0)

data/README.rdoc

@@ -1,6 +1,6 @@
 = rbczmq - binding for the high level ZeroMQ C API {<img src="https://secure.travis-ci.org/methodmissing/rbczmq.png" alt="Build Status" />}[http://travis-ci.org/methodmissing/rbczmq]
 
-(c) 2011-2013 Lourens Naudé (methodmissing), James Tucker (raggi), Matt Connolly (mattconnolly) with API guidance from the czmq (http://czmq.zeromq.org/) project.
+(c) 2011-2014 Lourens Naudé (methodmissing), James Tucker (raggi), Matt Connolly (mattconnolly) with API guidance from the czmq (http://czmq.zeromq.org/) project.
 
   http://github.com/methodmissing/rbczmq
 
@@ -206,7 +206,7 @@ Here's a few basic examples. Please refer to documentation (http://methodmissing
 * A POSIX compliant OS, known to work well on Linux, BSD variants, Mac OS X and SmartOS.
 * Ruby MRI 1.9, 2.0 or Rubinius (JRuby capi support forthcoming)
 * A C compiler
-* This is a "fat" gem, including its own source code for both ZeroMQ and CZMQ libraries. No system installation if either library is required.
+* This is a "fat" gem, including its own source code for both ZeroMQ and CZMQ libraries. No system installation of either library is required.
 
 == Installation
 
@@ -222,10 +222,14 @@ Building from source
     git submodule update
     rake
 
-Running tests
+Running all tests
 
     rake test
 
+Running a single test file:
+
+    ruby -Ilib test/test_context.rb
+
 OS X notes:
 
 If you are installing the package on a new Mac ensure you have libtool and autoconf installed.
@@ -247,7 +251,6 @@ This gem uses the "zmq" and "czmq" libraries, both of which are licensed under t
 * Revisit the ZMQ::Loop API
 * 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)
 * Incorporate examples into CI as well

data/ext/rbczmq/beacon.c

@@ -8,7 +8,10 @@
 static VALUE rb_czmq_nogvl_beacon_destroy(void *ptr)
 {
     zmq_beacon_wrapper *beacon = ptr;
-    zbeacon_destroy(&beacon->beacon);
+    if (beacon->beacon) {
+        zbeacon_destroy(&beacon->beacon);
+        beacon->beacon = NULL;
+    }
     return Qnil;
 }
 
@@ -186,7 +189,7 @@ static VALUE rb_czmq_beacon_publish(VALUE obj, VALUE transmit)
     GetZmqBeacon(obj);
     Check_Type(transmit, T_STRING);
     args.beacon = beacon;
-    args.transmit = StringValueCStr(transmit);
+    args.transmit = RSTRING_PTR(transmit);
     args.length = (int)RSTRING_LEN(transmit);
     rb_thread_blocking_region(rb_czmq_nogvl_publish, (void *)&args, RUBY_UBF_IO, 0);
     return Qnil;
@@ -254,7 +257,7 @@ static VALUE rb_czmq_beacon_subscribe(VALUE obj, VALUE filter)
         args.length = 0;
     } else {
         Check_Type(filter, T_STRING);
-        args.filter = StringValueCStr(filter);
+        args.filter = RSTRING_PTR(filter);
         args.length = (int)RSTRING_LEN(filter);
     }
     rb_thread_blocking_region(rb_czmq_nogvl_subscribe, (void *)&args, RUBY_UBF_IO, 0);

data/ext/rbczmq/context.c

@@ -1,6 +1,7 @@
 #include "rbczmq_ext.h"
 
 static VALUE intern_zctx_process;
+static zmutex_t* context_mutex = NULL; /* this can only be used outside of Ruby GVL to avoid deadlocks */
 
 static VALUE rb_czmq_ctx_set_iothreads(VALUE context, VALUE io_threads);
 
@@ -18,13 +19,19 @@ static VALUE get_pid()
 */
 static VALUE rb_czmq_nogvl_zctx_destroy(void *ptr)
 {
+    zmutex_lock(context_mutex);
+
     errno = 0;
     zmq_ctx_wrapper *ctx = ptr;
     if (ctx->pid == getpid()) {
-        /* only actually destroy the context if we are the process that created it. */
+        /* Only actually destroy the context if we are the process that created it. */
+        /* This may need to be changed when ZeroMQ's support for forking is improved. */
         zctx_destroy(&ctx->ctx);
     }
     ctx->flags |= ZMQ_CONTEXT_DESTROYED;
+
+    zmutex_unlock(context_mutex);
+
     return Qnil;
 }
 
@@ -37,9 +44,79 @@ static void rb_czmq_free_ctx(zmq_ctx_wrapper *ctx)
 {
     VALUE ctx_map;
     ctx_map = rb_ivar_get(rb_mZmq, intern_zctx_process);
+
+    // destroy sockets. This duplicates czmq's context shutdown which destroys sockets,
+    // but we need to process the list of Ruby ZMQ::Socket objects' data objects to mark
+    // them as closed so that they cannot be double destroyed.
+    zmq_sock_wrapper* socket;
+    while ((socket = zlist_pop(ctx->sockets))) {
+        rb_czmq_context_destroy_socket(socket);
+    }
+
+    // finally, shutdown the context.
     rb_thread_blocking_region(rb_czmq_nogvl_zctx_destroy, ctx, RUBY_UBF_IO, 0);
+
     ctx->ctx = NULL;
     rb_hash_aset(ctx_map, ctx->pidValue, Qnil);
+    zlist_destroy(&ctx->sockets);
+}
+
+/*
+ * :nodoc:
+ *  Destroy the socket while the GIL is released - may block depending on socket linger value.
+ *
+*/
+VALUE rb_czmq_nogvl_zsocket_destroy(void *ptr)
+{
+    zmutex_lock(context_mutex);
+
+    zmq_sock_wrapper *sock = ptr;
+    errno = 0;
+    // zclock_log ("I: %s socket %p, context %p: destroy", zsocket_type_str(sock->socket), sock, sock->ctx);
+    zsocket_destroy(sock->ctx, sock->socket);
+
+    zmutex_unlock(context_mutex);
+    return Qnil;
+}
+
+/*
+ * :nodoc:
+ *
+ * Interal use: Close a socket from the context being destroyed or garbage collected, or
+ * from the socket being closed, or garbage collected.
+ *
+ * The order of these events cannot be determined, so this function has to be idempotent
+ * about this. The close socket call to CZMQ must happen only once or it will abort the
+ * application.
+ */
+void rb_czmq_context_destroy_socket(zmq_sock_wrapper* socket)
+{
+    if (socket == NULL || socket->context == NULL) {
+        return;
+    }
+
+    if (socket && socket->context == Qnil) {
+        // A socket with a context object of Qnil is created by ZMQ::Beacon#new.
+        // zbeacon is responsible for closing this socket in its own context, we will simply mark
+        // it as destroyed and let the ZMQ::Beacon object do the clean up when its internal
+        // context is destroyed.
+    }
+    else if (socket->ctx && socket->ctx_wrapper && !(socket->flags & ZMQ_SOCKET_DESTROYED)) {
+        zmq_ctx_wrapper *ctx = (zmq_ctx_wrapper *)socket->ctx_wrapper;
+        if (ctx) {
+            // remove from the list of socket objects created by this context object.
+            zlist_remove(ctx->sockets, socket);
+
+            if (socket->socket) {
+                rb_thread_blocking_region(rb_czmq_nogvl_zsocket_destroy, socket, RUBY_UBF_IO, 0);
+            }
+        }
+    }
+
+    socket->flags |= ZMQ_SOCKET_DESTROYED;
+    socket->ctx = NULL;
+    socket->socket = NULL;
+    socket->state = ZMQ_SOCKET_DISCONNECTED;
 }
 
 /*
@@ -56,6 +133,19 @@ static void rb_czmq_free_ctx_gc(void *ptr)
     }
 }
 
+/*
+ * :nodoc:
+ *  GC mark callback
+ *
+*/
+static void rb_czmq_mark_ctx_gc(void *ptr)
+{
+    zmq_ctx_wrapper *ctx = (zmq_ctx_wrapper *)ptr;
+    if (ctx) {
+        rb_gc_mark(ctx->pidValue);
+    }
+}
+
 /*
  * :nodoc:
  *  Creates a new context while the GIL is released.
@@ -67,6 +157,7 @@ static VALUE rb_czmq_nogvl_zctx_new(ZMQ_UNUSED void *ptr)
     zctx_t *ctx = NULL;
     ctx = zctx_new();
     zctx_set_linger(ctx, 1);
+    zsys_handler_reset(); // restore ruby signal handlers.
     return (VALUE)ctx;
 }
 
@@ -93,12 +184,13 @@ static VALUE rb_czmq_ctx_s_new(int argc, VALUE *argv, VALUE context)
     rb_scan_args(argc, argv, "01", &io_threads);
     ctx_map = rb_ivar_get(rb_mZmq, intern_zctx_process);
     if (!NIL_P(rb_hash_aref(ctx_map, get_pid()))) rb_raise(rb_eZmqError, "single ZMQ context per process allowed");
-    context = Data_Make_Struct(rb_cZmqContext, zmq_ctx_wrapper, 0, rb_czmq_free_ctx_gc, ctx);
+    context = Data_Make_Struct(rb_cZmqContext, zmq_ctx_wrapper, rb_czmq_mark_ctx_gc, rb_czmq_free_ctx_gc, ctx);
     ctx->ctx = (zctx_t*)rb_thread_blocking_region(rb_czmq_nogvl_zctx_new, NULL, RUBY_UBF_IO, 0);
     ZmqAssertObjOnAlloc(ctx->ctx, ctx);
     ctx->flags = 0;
     ctx->pid = getpid();
     ctx->pidValue = get_pid();
+    ctx->sockets = zlist_new();
     rb_obj_call_init(context, 0, NULL);
     rb_hash_aset(ctx_map, ctx->pidValue, context);
     if (!NIL_P(io_threads)) rb_czmq_ctx_set_iothreads(context, io_threads);
@@ -189,7 +281,10 @@ VALUE rb_czmq_nogvl_socket_new(void *ptr)
 {
     errno = 0;
     struct nogvl_socket_args *args = ptr;
-    return (VALUE)zsocket_new(args->ctx, args->type);
+    zmutex_lock(context_mutex);
+    VALUE result = (VALUE)zsocket_new(args->ctx, args->type);
+    zmutex_unlock(context_mutex);
+    return result;
 }
 
 /*
@@ -219,15 +314,17 @@ static inline VALUE rb_czmq_ctx_socket_klass(int socket_type)
         case ZMQ_DEALER: return rb_cZmqDealerSocket;
                          break;
         case ZMQ_XPUB: return rb_cZmqXPubSocket;
-                      break;
+                       break;
         case ZMQ_XSUB: return rb_cZmqXSubSocket;
-                      break;
+                       break;
+        case ZMQ_STREAM: return rb_cZmqStreamSocket;
+                         break;
         default: rb_raise(rb_eZmqError, "ZMQ socket type %d not supported!", socket_type);
                  break;
     }
 }
 
-VALUE rb_czmq_socket_alloc(VALUE context, zctx_t *ctx, void *s)
+VALUE rb_czmq_socket_alloc(VALUE context, zctx_t *zctx, void *s)
 {
     VALUE socket;
     zmq_sock_wrapper *sock = NULL;
@@ -235,7 +332,13 @@ VALUE rb_czmq_socket_alloc(VALUE context, zctx_t *ctx, void *s)
     sock->socket = s;
     ZmqAssertObjOnAlloc(sock->socket, sock);
     sock->flags = 0;
-    sock->ctx = ctx;
+    sock->ctx = zctx; // czmq context
+    if (context == Qnil) {
+        sock->ctx_wrapper = NULL;
+    } else {
+        ZmqGetContext(context);
+        sock->ctx_wrapper = ctx; // rbczmq ZMQ::Context wrapped data struct
+    }
     sock->verbose = false;
     sock->state = ZMQ_SOCKET_PENDING;
     sock->endpoints = rb_ary_new();
@@ -276,7 +379,11 @@ static VALUE rb_czmq_ctx_socket(VALUE obj, VALUE type)
 
     args.ctx = ctx->ctx;
     args.type = socket_type;
-    return rb_czmq_socket_alloc(obj, ctx->ctx, (void*)rb_thread_blocking_region(rb_czmq_nogvl_socket_new, (void *)&args, RUBY_UBF_IO, 0));
+    VALUE socket_object = rb_czmq_socket_alloc(obj, ctx->ctx, (void*)rb_thread_blocking_region(rb_czmq_nogvl_socket_new, (void *)&args, RUBY_UBF_IO, 0));
+    zmq_sock_wrapper *sock = NULL;
+    GetZmqSocket(socket_object);
+    zlist_push(ctx->sockets, sock);
+    return socket_object;
 }
 
 void _init_rb_czmq_context()
@@ -291,4 +398,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);
+
+    context_mutex = zmutex_new();
 }