nanomsg 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf073be2c61a88c963a9f8ef307a9998bd1b3f5b
-  data.tar.gz: d9716565e40d9c22758359b1d23d33633ce4d36c
+  metadata.gz: 338cb73be8a94cc3ee3fb4627973faedae7e81f2
+  data.tar.gz: be4319a9d07c46bd202c91a003a690e2dcdff1b4
 SHA512:
-  metadata.gz: c08a0c71dd600d0d173941e112274546e9ce599cebc6356c441edf6a2b3f2f84c5f0e501ccb00d2974af9d41dabdb119ec00dddcf0667b6a1d059d70e78ccacb
-  data.tar.gz: 3b6387a060e1afc2ff6dcfeb3c2f97385498ddf6dfa731bcdcdefe4fb84de994b269e2a37a140ab08bd375f33f64dd5baa03a0b4ad4e03ce443758ba2156a1da
+  metadata.gz: 0a77d0a5624efb61e649bc1486766fea9e3ac1260ce23b61daabfe83b6a7b4525840669c01ff2417a6f17dae3fc80688f874ef453167cca7c7b7cc7c79f6074a
+  data.tar.gz: 0f2470ea6c65d1130d6cfbd965af5abecd32ea3134fa4ef9f0c4de84313e891e060d417fd73de36cbf9ac883288e759577b5bbaae809977293541323f7ad1bd8

data/HISTORY

@@ -1,3 +1,7 @@
+= 0.5 / 27Aug2015
+
+  * GVL-code is now compatible with Ruby 2.2. 
+
 = 0.3 / 4Sept2013
 
   * Fixes GVL related blocking behaviour, recv/send will now _NOT_ consume 

data/README

@@ -42,10 +42,12 @@ SYNOPSIS
 
 STATUS
 
-Very early alpha, not much testing has been done. All socket types and devices
-should work. 
+Works with a range of nanomsg versions, last one verified is 0.6. Should work
+for mri rubies 1.9, 2.0, 2.1, 2.2.
+
+Beta software: If you know what you're doing, you can use this in production. 
 
 LICENSE
 
-See file LICENSE, Copyright (c) 2013 Kaspar Schiess
+See file LICENSE, Copyright (c) 2013-2015 Kaspar Schiess
 

data/ext/extconf.rb

@@ -2,4 +2,9 @@ require 'mkmf'
 
 have_library 'nanomsg'
 
+# define either HAVE_RB_THREAD_CALL_WITHOUT_GVL or
+# HAVE_RB_THREAD_BLOCKING_REGION. We cannot compile without atm.
+have_func('rb_thread_call_without_gvl', 'ruby/thread.h')
+have_func('rb_thread_blocking_region', 'ruby.h')
+
 create_makefile('nanomsg_ext')

data/ext/init.c

@@ -11,6 +11,21 @@
 
 #include "constants.h"
 
+/* 
+  This API was essentially renamed in Ruby 2.2. Let's provide a small layer 
+  that allows us to compile in both <2.2 and >=2.2 versions. 
+*/
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+/* Ruby 2.0+ */
+#  include <ruby/thread.h>
+#  define WITHOUT_GVL(fn,a,ubf,b) \
+  rb_thread_call_without_gvl((fn),(a),(ubf),(b))
+#elif defined(HAVE_RB_THREAD_BLOCKING_REGION)
+typedef VALUE (*blocking_fn_t)(void*);
+#  define WITHOUT_GVL(fn,a,ubf,b) \
+  rb_thread_blocking_region((blocking_fn_t)(fn),(a),(ubf),(b))
+#endif
+
 static VALUE mNanoMsg;
 static VALUE cSocket; 
 
@@ -147,7 +162,7 @@ struct ioop {
   long len; 
 };
 
-static VALUE
+static void*
 sock_send_blocking(void* data)
 {
   struct ioop *pio = data; 
@@ -156,7 +171,7 @@ sock_send_blocking(void* data)
   if (pio->return_code < 0)
     pio->nn_errno = nn_errno(); 
 
-  return Qnil;   
+  return (void*) 0;   
 }
 
 static VALUE
@@ -168,7 +183,7 @@ sock_send(VALUE socket, VALUE buffer)
   io.buffer = StringValuePtr(buffer);
   io.len = RSTRING_LEN(buffer);
 
-  rb_thread_blocking_region(sock_send_blocking, &io, RUBY_UBF_IO, 0);
+  WITHOUT_GVL(sock_send_blocking, &io, RUBY_UBF_IO, 0);
 
   if (io.return_code < 0)
     sock_raise_error(io.nn_errno);
@@ -176,7 +191,7 @@ sock_send(VALUE socket, VALUE buffer)
   return INT2NUM(io.return_code);
 }
 
-static VALUE
+static void*
 sock_recv_blocking(void* data)
 {
   struct ioop *pio = data; 
@@ -186,7 +201,7 @@ sock_recv_blocking(void* data)
   if (pio->return_code < 0)
     pio->nn_errno = nn_errno(); 
 
-  return Qnil; 
+  return (void*) 0; 
 }
 
 static VALUE
@@ -197,7 +212,7 @@ sock_recv(VALUE socket)
 
   io.sock = sock_get(socket);
 
-  rb_thread_blocking_region(sock_recv_blocking, &io, RUBY_UBF_IO, 0);
+  WITHOUT_GVL(sock_recv_blocking, &io, RUBY_UBF_IO, 0);
 
   if (io.return_code < 0)
     sock_raise_error(io.nn_errno);
@@ -208,7 +223,7 @@ sock_recv(VALUE socket)
   return result;
 }
 
-static VALUE
+static void*
 sock_close_no_gvl(void* data)
 {
   struct ioop *pio = (struct ioop*) data; 
@@ -217,7 +232,7 @@ sock_close_no_gvl(void* data)
   if (pio->return_code < 0)
     pio->nn_errno = nn_errno();
 
-  return Qnil;
+  return (void*) 0;
 }
 
 static VALUE
@@ -229,7 +244,7 @@ sock_close(VALUE socket)
 
   // I've no idea on how to abort a close (which may block for NN_LINGER 
   // seconds), so we'll be uninterruptible. 
-  rb_thread_blocking_region(sock_close_no_gvl, &io, RUBY_UBF_IO, 0);
+  WITHOUT_GVL(sock_close_no_gvl, &io, RUBY_UBF_IO, 0);
 
   if (io.return_code < 0)
     sock_raise_error(io.nn_errno);
@@ -379,14 +394,14 @@ struct device_op {
   int err; 
 };
 
-static VALUE
+static void*
 nanomsg_run_device_no_gvl(void* data)
 {
   struct device_op *pop = (struct device_op*) data;
 
   pop->err = nn_device(pop->sa, pop->sb);
 
-  return Qnil; 
+  return (void*) 0; 
 }
 
 static VALUE
@@ -397,7 +412,7 @@ nanomsg_run_device(VALUE self, VALUE a, VALUE b)
   dop.sa = sock_get(a);
   dop.sb = sock_get(b);
 
-  rb_thread_blocking_region(nanomsg_run_device_no_gvl, &dop, RUBY_UBF_IO, 0);
+  WITHOUT_GVL(nanomsg_run_device_no_gvl, &dop, RUBY_UBF_IO, 0);
   if (dop.err < 0)
     RAISE_SOCK_ERROR;
 
@@ -412,7 +427,7 @@ nanomsg_run_loopback(VALUE self, VALUE a)
   dop.sa = sock_get(a);
   dop.sb = -1;          // invalid socket, see documentation
 
-  rb_thread_blocking_region(nanomsg_run_device_no_gvl, &dop, RUBY_UBF_IO, 0);
+  WITHOUT_GVL(nanomsg_run_device_no_gvl, &dop, RUBY_UBF_IO, 0);
   if (dop.err < 0)
     RAISE_SOCK_ERROR;
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanomsg
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Kaspar Schiess
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies: []
 description: "    nanomsg library is a high-performance implementation of several
   \"scalability \n    protocols\". Scalability protocol's job is to define how multiple
@@ -66,10 +66,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby binding for nanomsg. nanomsg library is a high-performance implementation
   of several "scalability protocols".
 test_files: []
-has_rdoc: