rbczmq 1.0 → 1.1

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = Changelog
 
+== 1.1 (April 4, 2012)
+* Bump czmq to version 1.4.0
+* Enable debug symbols for czmq in order to track down a GC bug with ZMQ::Message
+
 == 1.0 (November 24, 2012)
 * Supports ZeroMQ 3.2.2 (first stable and backwards compatible 3.x release)
 * Monitoring API for handling socket state changes / events

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbczmq (0.8)
+    rbczmq (1.1)
 
 GEM
   remote: http://rubygems.org/

data/ext/rbczmq/context.c

@@ -301,7 +301,7 @@ static VALUE rb_czmq_ctx_socket(VALUE obj, VALUE type)
 #endif
     sock->flags = 0;
     sock->ctx = ctx->ctx;
-    sock->verbose = FALSE;
+    sock->verbose = false;
     sock->state = ZMQ_SOCKET_PENDING;
     sock->endpoints = rb_ary_new();
     sock->thread = rb_thread_current();

data/ext/rbczmq/extconf.rb

@@ -39,7 +39,7 @@ def check_heads heads = [], fatal = false
   heads.all? { |head| have_header(head) || (abort("could not find header: #{head}") if fatal)}
 end
 
-CZMQ_CFLAGS = []
+CZMQ_CFLAGS = %w(-g)
 
 case RUBY_PLATFORM
 when /mswin32/, /mingw32/, /bccwin32/

data/ext/rbczmq/frame.c

@@ -232,7 +232,7 @@ static VALUE rb_czmq_frame_data_equals_p(VALUE obj, VALUE data)
 {
     ZmqGetFrame(obj);
     Check_Type(data, T_STRING);
-    return (zframe_streq(frame, RSTRING_PTR(data)) == TRUE) ? Qtrue : Qfalse;
+    return (zframe_streq(frame, RSTRING_PTR(data)) == true) ? Qtrue : Qfalse;
 }
 
 /*

data/ext/rbczmq/loop.c

@@ -19,7 +19,7 @@ static VALUE rb_czmq_callback0(VALUE *args)
 ZMQ_NOINLINE static int rb_czmq_loop_started_callback(ZMQ_UNUSED zloop_t *loop, ZMQ_UNUSED zmq_pollitem_t *item, void *arg)
 {
     zmq_loop_wrapper *loop_wrapper = arg;
-    loop_wrapper->running = TRUE;
+    loop_wrapper->running = true;
     return 0;
 }
 
@@ -32,7 +32,7 @@ ZMQ_NOINLINE static int rb_czmq_loop_started_callback(ZMQ_UNUSED zloop_t *loop,
 ZMQ_NOINLINE static int rb_czmq_loop_breaker_callback(ZMQ_UNUSED zloop_t *loop, ZMQ_UNUSED zmq_pollitem_t *item, void *arg)
 {
     zmq_loop_wrapper *loop_wrapper = arg;
-    loop_wrapper->running = FALSE;
+    loop_wrapper->running = false;
     return -1;
 }
 
@@ -72,7 +72,7 @@ ZMQ_NOINLINE static int rb_czmq_loop_timer_callback(zloop_t *loop, ZMQ_UNUSED zm
     int rc;
     VALUE args[3];
     ZmqGetTimer((VALUE)cb);
-    if (timer->cancelled == TRUE) {
+    if (timer->cancelled == true) {
        zloop_timer_end(loop, (void *)cb);
        return 0;
     }
@@ -163,8 +163,8 @@ static VALUE rb_czmq_loop_new(VALUE loop)
     lp->loop = zloop_new();
     ZmqAssertObjOnAlloc(lp->loop, lp);
     lp->flags = 0;
-    lp->running = FALSE;
-    lp->verbose = FALSE;
+    lp->running = false;
+    lp->verbose = false;
     rb_obj_call_init(loop, 0, NULL);
     return loop;
 }
@@ -209,7 +209,7 @@ static VALUE rb_czmq_loop_start(VALUE obj)
 static VALUE rb_czmq_loop_running_p(VALUE obj)
 {
     ZmqGetLoop(obj);
-    return (loop->running == TRUE) ? Qtrue : Qfalse;
+    return (loop->running == true) ? Qtrue : Qfalse;
 }
 
 /*
@@ -238,7 +238,7 @@ static void rb_czmq_loop_stop0(zmq_loop_wrapper *loop)
 static VALUE rb_czmq_loop_stop(VALUE obj)
 {
     ZmqGetLoop(obj);
-    if (loop->running == FALSE) rb_raise(rb_eZmqError, "event loop not running!");
+    if (loop->running == false) rb_raise(rb_eZmqError, "event loop not running!");
     rb_czmq_loop_stop0(loop);
     return Qnil;
 }
@@ -278,9 +278,9 @@ static VALUE rb_czmq_loop_destroy(VALUE obj)
 
 static VALUE rb_czmq_loop_set_verbose(VALUE obj, VALUE level)
 {
-    Bool vlevel;
+    bool vlevel;
     ZmqGetLoop(obj);
-    vlevel = (level == Qtrue) ? TRUE : FALSE;
+    vlevel = (level == Qtrue) ? true : false;
     zloop_set_verbose(loop->loop, vlevel);
     loop->verbose = vlevel;
     return Qnil;
@@ -309,7 +309,7 @@ static VALUE rb_czmq_loop_register(VALUE obj, VALUE pollable)
     rc = zloop_poller(loop->loop, pollitem->item, rb_czmq_loop_pollitem_callback, (void *)pollitem);
     ZmqAssert(rc);
     /* Let pollable be verbose if loop is verbose */
-    if (loop->verbose == TRUE) rb_czmq_pollitem_set_verbose(pollable, Qtrue);
+    if (loop->verbose == true) rb_czmq_pollitem_set_verbose(pollable, Qtrue);
     return Qtrue;
 }
 

data/ext/rbczmq/loop.h

@@ -6,8 +6,8 @@
 typedef struct {
     zloop_t  *loop;
     int flags;
-    Bool verbose;
-    Bool running;
+    bool verbose;
+    bool running;
 } zmq_loop_wrapper;
 
 #define ZmqAssertLoop(obj) ZmqAssertType(obj, rb_cZmqLoop, "ZMQ::Loop")

data/ext/rbczmq/poller.c

@@ -47,7 +47,7 @@ int rb_czmq_poller_rebuild_pollset(zmq_poll_wrapper *poller)
         ZmqGetPollitem(pollable);
         poller->pollset[rebuilt] = *pollitem->item;
     }
-    poller->dirty = FALSE;
+    poller->dirty = false;
     return 0;
 }
 
@@ -93,8 +93,8 @@ VALUE rb_czmq_poller_new(VALUE obj)
     poller->pollables = rb_ary_new();
     poller->readables = rb_ary_new();
     poller->writables = rb_ary_new();
-    poller->dirty = FALSE;
-    poller->verbose = FALSE;
+    poller->dirty = false;
+    poller->verbose = false;
     rb_obj_call_init(obj, 0, NULL);
     return obj;
 }
@@ -143,7 +143,7 @@ VALUE rb_czmq_poller_poll(int argc, VALUE *argv, VALUE obj)
     if (NIL_P(tmout)) tmout = INT2NUM(0);
     if (TYPE(tmout) != T_FIXNUM && TYPE(tmout) != T_FLOAT) rb_raise(rb_eTypeError, "wrong timeout type %s (expected Fixnum or Float)", RSTRING_PTR(rb_obj_as_string(tmout)));
     if (poller->poll_size == 0) return INT2NUM(0);
-    if (poller->dirty == TRUE) {
+    if (poller->dirty == true) {
         rc = rb_czmq_poller_rebuild_pollset(poller);
         if (rc == -1) rb_raise(rb_eZmqError, "failed in rebuilding the pollset!");
     }
@@ -193,10 +193,10 @@ VALUE rb_czmq_poller_register(VALUE obj, VALUE pollable)
     pollable = rb_czmq_pollitem_coerce(pollable);
     ZmqGetPollitem(pollable);
     /* Let pollable item be verbose if poller is verbose */
-    if (poller->verbose == TRUE) rb_czmq_pollitem_set_verbose(pollable, Qtrue);
+    if (poller->verbose == true) rb_czmq_pollitem_set_verbose(pollable, Qtrue);
     rb_ary_push(poller->pollables, pollable);
     poller->poll_size++;
-    poller->dirty = TRUE;
+    poller->dirty = true;
     return pollable;
 }
 
@@ -226,7 +226,7 @@ VALUE rb_czmq_poller_remove(VALUE obj, VALUE pollable)
         if (pollable == rpollable || rb_czmq_pollitem_pollable(pollable) == rb_czmq_pollitem_pollable(rpollable)) {
             rb_ary_delete(poller->pollables, rpollable);
             poller->poll_size--;
-            poller->dirty = TRUE;
+            poller->dirty = true;
             return rpollable;
         }
     }
@@ -287,9 +287,9 @@ VALUE rb_czmq_poller_writables(VALUE obj)
 
 static VALUE rb_czmq_poller_set_verbose(VALUE obj, VALUE level)
 {
-    Bool vlevel;
+    bool vlevel;
     ZmqGetPoller(obj);
-    vlevel = (level == Qtrue) ? TRUE : FALSE;
+    vlevel = (level == Qtrue) ? true : false;
     poller->verbose = vlevel;
     return Qnil;
 }

data/ext/rbczmq/poller.h

@@ -7,8 +7,8 @@ typedef struct {
     VALUE writables;
     zmq_pollitem_t *pollset;
     int poll_size;
-    Bool dirty;
-    Bool verbose;
+    bool dirty;
+    bool verbose;
 } zmq_poll_wrapper;
 
 #define ZmqAssertPoller(obj) ZmqAssertType(obj, rb_cZmqPoller, "ZMQ::Poller")

data/ext/rbczmq/pollitem.c

@@ -229,10 +229,10 @@ VALUE rb_czmq_pollitem_handler_equals(VALUE obj, VALUE handler)
 
 VALUE rb_czmq_pollitem_set_verbose(VALUE obj, VALUE level)
 {
-    Bool vlevel;
+    bool vlevel;
     zmq_sock_wrapper *sock = NULL;
     ZmqGetPollitem(obj);
-    vlevel = (level == Qtrue) ? TRUE : FALSE;
+    vlevel = (level == Qtrue) ? true : false;
     if (rb_obj_is_kind_of(pollitem->socket, rb_cZmqSocket)) {
         GetZmqSocket(pollitem->socket);
         sock->verbose = vlevel;

data/ext/rbczmq/rbczmq_ext.c

@@ -46,7 +46,7 @@ rb_encoding *binary_encoding;
 
 static VALUE rb_czmq_m_interrupted_p(ZMQ_UNUSED VALUE obj)
 {
-    return (zctx_interrupted == TRUE) ? Qtrue : Qfalse;
+    return (zctx_interrupted == true) ? Qtrue : Qfalse;
 }
 
 /*

data/ext/rbczmq/socket.c

@@ -289,10 +289,10 @@ static VALUE rb_czmq_socket_connect(VALUE obj, VALUE endpoint)
 
 static VALUE rb_czmq_socket_set_verbose(VALUE obj, VALUE level)
 {
-    Bool vlevel;
+    bool vlevel;
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    vlevel = (level == Qtrue) ? TRUE : FALSE;
+    vlevel = (level == Qtrue) ? true : false;
     sock->verbose = vlevel;
     return Qnil;
 }
@@ -310,10 +310,10 @@ static VALUE rb_czmq_nogvl_zstr_send(void *ptr)
 #ifdef HAVE_RB_THREAD_BLOCKING_REGION
     return (VALUE)zstr_send(socket->socket, args->msg);
 #else
-    if (rb_thread_alone()) return (VALUE)zstr_send_nowait(socket->socket, args->msg);
+    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_nowait(socket->socket, args->msg);
+        return (VALUE)zstr_send(socket->socket, args->msg);
     } else {
         rb_thread_wait_fd(zsocket_fd(socket->socket));
         if (zsocket_sndtimeo(socket->socket) != -1)

data/ext/rbczmq/socket.h

@@ -13,7 +13,7 @@ typedef struct {
     zctx_t *ctx;
     void *socket;
     int flags;
-    Bool verbose;
+    bool verbose;
     int state;
 #ifndef HAVE_RB_THREAD_BLOCKING_REGION
     zlist_t *str_buffer;
@@ -106,20 +106,20 @@ void rb_czmq_free_sock_gc(void *ptr);
 struct nogvl_send_args {
     zmq_sock_wrapper *socket;
     const char *msg;
-    Bool read;
+    bool read;
 };
 
 struct nogvl_send_frame_args {
     zmq_sock_wrapper *socket;
     zframe_t *frame;
     int flags;
-    Bool read;
+    bool read;
 };
 
 struct nogvl_send_message_args {
     zmq_sock_wrapper *socket;
     zmsg_t *message;
-    Bool read;
+    bool read;
 };
 
 struct nogvl_recv_args {

data/ext/rbczmq/timer.c

@@ -49,7 +49,7 @@ VALUE rb_czmq_timer_s_new(int argc, VALUE *argv, VALUE timer)
     Check_Type(times, T_FIXNUM);
     timer_delay = (size_t)(((TYPE(delay) == T_FIXNUM) ? FIX2LONG(delay) : RFLOAT_VALUE(delay)) * 1000); 
     timer = Data_Make_Struct(rb_cZmqTimer, zmq_timer_wrapper, rb_czmq_mark_timer, rb_czmq_free_timer_gc, tr);
-    tr->cancelled = FALSE;
+    tr->cancelled = false;
     tr->delay = timer_delay;
     tr->times = FIX2INT(times);
     tr->callback = callback;
@@ -72,7 +72,7 @@ VALUE rb_czmq_timer_s_new(int argc, VALUE *argv, VALUE timer)
 static VALUE rb_czmq_timer_fire(VALUE obj, VALUE args)
 {
     ZmqGetTimer(obj);
-    if (timer->cancelled == TRUE) rb_raise(rb_eZmqError, "cannot fire timer, already cancelled!");
+    if (timer->cancelled == true) rb_raise(rb_eZmqError, "cannot fire timer, already cancelled!");
     return rb_apply(timer->callback, intern_call, args); 
 }
 
@@ -91,7 +91,7 @@ static VALUE rb_czmq_timer_fire(VALUE obj, VALUE args)
 static VALUE rb_czmq_timer_cancel(VALUE obj)
 {
     ZmqGetTimer(obj);
-    timer->cancelled = TRUE;
+    timer->cancelled = true;
     return Qnil; 
 }
 

data/ext/rbczmq/timer.h

@@ -4,7 +4,7 @@
 typedef struct {
     size_t delay;
     size_t times;
-    Bool cancelled;
+    bool cancelled;
     VALUE callback;
 } zmq_timer_wrapper;
 

data/lib/zmq/version.rb

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

metadata

@@ -1,49 +1,42 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rbczmq
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: '1.1'
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  version: "1.0"
 platform: ruby
-authors: 
-- "Lourens Naud\xC3\xA9"
+authors:
+- Lourens Naudé
 - James Tucker
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake-compiler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.8.0
   type: :development
-  version_requirements: *id001
-description: "Ruby extension for CZMQ - High-level C Binding for \xC3\x98MQ (http://czmq.zeromq.org)"
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+description: Ruby extension for CZMQ - High-level C Binding for ØMQ (http://czmq.zeromq.org)
+email:
 - lourens@methodmissing.com
 - jftucker@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/rbczmq/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.rdoc
@@ -150,38 +143,30 @@ files:
 - test/test_zmq.rb
 homepage: http://github.com/methodmissing/rbczmq
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: "Ruby extension for CZMQ - High-level C Binding for \xC3\x98MQ (http://czmq.zeromq.org)"
-test_files: 
+summary: Ruby extension for CZMQ - High-level C Binding for ØMQ (http://czmq.zeromq.org)
+test_files:
 - test/helper.rb
 - test/socket/test_dealer_socket.rb
 - test/socket/test_pair_socket.rb