zookeeper 1.4.9 → 1.4.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTM5ZGVmMzE2NGE3NWI1OWI2MWIwMTI1M2QwYmJhNjUzODEzM2MyZg==
+    Y2ExZTdhNmM5YTg4NDNhM2M4ZmYyNTljMzYxMTk1MWZhODBkNzc2Nw==
   data.tar.gz: !binary |-
-    YjA1NTJjN2IxOTQxNDExNTdkMmI0NjY0YjFiMDAzNjI5YzIwNmUyZA==
+    NTg0ZjdhODRhMzkxMGFlOWYwNDZmYTcwMmVhYzdjZTg2OTNmYjQ2Mw==
 SHA512:
   metadata.gz: !binary |-
-    Yjg0ZThjYTk1YzcxYWEyMGNmMjQwZDMwODY5MjVlMTU5MWNmMGEyOGE2MDk4
-    ZWM5ODljZDY3ODgyNzUyNGNmYjU0NmE2ZWVkNmY5NzA3M2QwMGI0YmVkZTJl
-    ZWVkNzc3MWY4YjM4YWRjMGZmY2Q3YTIyZTg2ZGM4MmQwNjgxYTY=
+    OTQ2OGJjNmU5MTQ1MTgwMWM5ODIyMTRjZGYwOWQxYzIxMTIzZDJjYTM5ZWI4
+    MzU2YTkzY2YzNWE0NTA3NDU2MWE5Nzg0OTY4NDVlYzY1NjIxODJmMzNhMjE2
+    MDMzNmY5MzEwYmJkMDM5NTQzMzQyZGVjOTVjOWYzZGFiYTdkMTY=
   data.tar.gz: !binary |-
-    N2M1MjVkZmMwYzAxYjljOTJiMGU5ODNiZTJjZmVmZjJjNmJmMGE5OGIxYTM5
-    MTllZjEzNTRiZGJkMjdiZTFkNTI2MzIwMzg1YmMwZjY4NDBhYzUxYWMyOTU2
-    MDJmZTM0MTVhZTM1NTYxNTIwNWQwNWQ5NDYxNTg4MGUzYzBmOTk=
+    MzIwMGViM2Y4ZWYyNzYzOWFmNjNjNTIyZGM1ODJhOWI2Mzk4MGFjYWE0OTg1
+    ZjhjYWVkZWIxMjFlYmIyOWIzMzYwZDFlZTljNzAwM2FhOTkwNWU0MGExYTYw
+    ZmE2OTA3MzRlNjgzYzA2Y2I0MDViZDRjMDMyYzU2ZjIxNDYyMWE=

data/.travis.yml

@@ -23,6 +23,8 @@ rvm:
   - rbx-18mode
   - rbx-19mode
   - 2.0.0
+  - 2.1.0
+  - 2.2.0
 matrix:
   allow_failures:
     - rvm: rbx-18mode

data/Gemfile

@@ -6,7 +6,7 @@ gem 'rake', '~> 0.9.0'
 
 group :test do
   gem "rspec" , "~> 2.11"
-  gem 'eventmachine', '1.0.0'
+  gem 'eventmachine', '1.0.4'
   gem 'evented-spec', '~> 0.9.0'
   gem 'zk-server', '~> 1.0', :git => 'https://github.com/zk-ruby/zk-server.git'
 end

data/ext/extconf.rb

@@ -68,7 +68,7 @@ Dir.chdir(HERE) do
     # clean up stupid apple rsrc fork bullshit
     FileUtils.rm_f(Dir['**/._*'].select{|p| test(?f, p)})
 
-    Dir.chdir(BUNDLE_PATH) do        
+    Dir.chdir(BUNDLE_PATH) do
       configure = "./configure --prefix=#{HERE} --with-pic --without-cppunit --disable-dependency-tracking #{$EXTRA_CONF} 2>&1"
       configure = "env CFLAGS='#{DEBUG_CFLAGS}' #{configure}" if ZK_DEBUG
 
@@ -85,13 +85,14 @@ end
 Dir.chdir("#{HERE}/lib") do
   %w[st mt].each do |stmt|
     %w[a la].each do |ext|
-      system("cp -f libzookeeper_#{stmt}.#{ext} libzookeeper_#{stmt}_gem.#{ext}") 
+      system("cp -f libzookeeper_#{stmt}.#{ext} libzookeeper_#{stmt}_gem.#{ext}")
     end
   end
 end
 $LIBS << " -lzookeeper_st_gem"
 
 have_func('rb_thread_blocking_region')
+have_func('rb_thread_fd_select')
 
 $CFLAGS << ' -Wall' if ZK_DEV
 create_makefile 'zookeeper_c'

data/ext/zkrb.c

@@ -73,6 +73,17 @@
 #include "ruby/io.h"
 #endif
 
+#ifndef HAVE_RB_THREAD_FD_SELECT
+#define rb_fdset_t fd_set
+#define rb_fd_isset(n, f) FD_ISSET(n, f)
+#define rb_fd_init(f) FD_ZERO(f)
+#define rb_fd_zero(f)  FD_ZERO(f)
+#define rb_fd_set(n, f)  FD_SET(n, f)
+#define rb_fd_clr(n, f) FD_CLR(n, f)
+#define rb_fd_term(f)
+#define rb_thread_fd_select rb_thread_select
+#endif
+
 #include "zookeeper/zookeeper.h"
 #include <errno.h>
 #include <stdio.h>
@@ -787,8 +798,8 @@ inline static int get_self_pipe_read_fd(VALUE self) {
 static VALUE method_zkrb_iterate_event_loop(VALUE self) {
   FETCH_DATA_PTR(self, zk);
 
-  fd_set rfds, wfds, efds;
-  FD_ZERO(&rfds); FD_ZERO(&wfds); FD_ZERO(&efds);
+  rb_fdset_t rfds, wfds, efds;
+  rb_fd_init(&rfds); rb_fd_init(&wfds); rb_fd_init(&efds);
 
   int fd = 0, interest = 0, events = 0, rc = 0, maxfd = 0, irc = 0, prc = 0;
   struct timeval tv;
@@ -797,14 +808,14 @@ static VALUE method_zkrb_iterate_event_loop(VALUE self) {
 
   if (fd != -1) {
     if (interest & ZOOKEEPER_READ) {
-      FD_SET(fd, &rfds);
+      rb_fd_set(fd, &rfds);
     } else {
-      FD_CLR(fd, &rfds);
+      rb_fd_clr(fd, &rfds);
     }
     if (interest & ZOOKEEPER_WRITE) {
-      FD_SET(fd, &wfds);
+      rb_fd_set(fd, &wfds);
     } else {
-      FD_CLR(fd, &wfds);
+      rb_fd_clr(fd, &wfds);
     }
   } else {
     fd = 0;
@@ -813,22 +824,22 @@ static VALUE method_zkrb_iterate_event_loop(VALUE self) {
   // add our self-pipe to the read set, allow us to wake up in case our attention is needed
   int pipe_r_fd = get_self_pipe_read_fd(self);
 
-  FD_SET(pipe_r_fd, &rfds);
+  rb_fd_set(pipe_r_fd, &rfds);
 
   maxfd = (pipe_r_fd > fd) ? pipe_r_fd : fd;
 
-  rc = rb_thread_select(maxfd+1, &rfds, &wfds, &efds, &tv);
+  rc = rb_thread_fd_select(maxfd+1, &rfds, &wfds, &efds, &tv);
 
   if (rc > 0) {
-    if (FD_ISSET(fd, &rfds)) {
+    if (rb_fd_isset(fd, &rfds)) {
       events |= ZOOKEEPER_READ;
     }
-    if (FD_ISSET(fd, &wfds)) {
+    if (rb_fd_isset(fd, &wfds)) {
       events |= ZOOKEEPER_WRITE;
     }
 
     // we got woken up by the self-pipe
-    if (FD_ISSET(pipe_r_fd, &rfds)) {
+    if (rb_fd_isset(pipe_r_fd, &rfds)) {
       // one event has awoken us, so we clear one event from the pipe
       char b[1];
 
@@ -853,6 +864,9 @@ static VALUE method_zkrb_iterate_event_loop(VALUE self) {
       prc, interest, fd, pipe_r_fd, maxfd, irc, tv.tv_sec + (tv.tv_usec/ 1000.0 / 1000.0));
   }
 
+  rb_fd_term(&rfds);
+  rb_fd_term(&wfds);
+  rb_fd_term(&efds);
   return INT2FIX(prc);
 }
 

data/lib/zookeeper/version.rb

@@ -1,4 +1,4 @@
 module Zookeeper
-  VERSION = '1.4.9'
+  VERSION = '1.4.10'
   DRIVER_VERSION = '3.4.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zookeeper
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.4.10
 platform: ruby
 authors:
 - Phillip Pearson
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies: []
 description: ! 'A low-level multi-Ruby wrapper around the ZooKeeper API bindings.
   For a
@@ -134,7 +134,7 @@ 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: Apache ZooKeeper driver for Rubies