slyphon-zookeeper 0.2.3 → 0.2.4

data/ext/zookeeper_c.c

@@ -19,6 +19,7 @@
 #include <unistd.h>
 #include <sys/fcntl.h>
 #include <pthread.h>
+#include <inttypes.h>
 
 #include "zookeeper_lib.h"
 
@@ -49,7 +50,9 @@ static int destroy_zkrb_instance(struct zkrb_instance_data* ptr) {
   if (ptr->zh) {
     const void *ctx = zoo_get_context(ptr->zh);
     /* Note that after zookeeper_close() returns, ZK handle is invalid */
+    if (ZKRBDebugging) fprintf(stderr, "calling zookeeper_close\n"); 
     rv = zookeeper_close(ptr->zh);
+    if (ZKRBDebugging) fprintf(stderr, "zookeeper_close returned %d\n", rv); 
     free((void *) ctx);
   }
 
@@ -69,7 +72,7 @@ static void print_zkrb_instance_data(struct zkrb_instance_data* ptr) {
   fprintf(stderr, "zkrb_instance_data (%p) {\n", ptr);
   fprintf(stderr, "   zh = %p\n",           ptr->zh);
   fprintf(stderr, "     { state = %d }\n",  zoo_state(ptr->zh));
-  fprintf(stderr, "   id = %llx\n",         ptr->myid.client_id);
+  fprintf(stderr, "   id = %"PRId64"\n",    ptr->myid.client_id);   // PRId64 defined in inttypes.h
   fprintf(stderr, "    q = %p\n",           ptr->queue);
   fprintf(stderr, "}\n");
 }
@@ -521,7 +524,7 @@ static VALUE method_get_next_event(VALUE self, VALUE blocking) {
           rb_raise(rb_eRuntimeError, "read failed: %d", errno);
         }
         else if (ZKRBDebugging) {
-          fprintf(stderr, "read %d bytes from the queue (%p)'s pipe\n", bytes_read, zk->queue);
+          fprintf(stderr, "read %zd bytes from the queue (%p)'s pipe\n", bytes_read, zk->queue);
         }
 
         continue;
@@ -579,10 +582,13 @@ static VALUE method_close_handle(VALUE self) {
   // has been called
   rb_iv_set(self, "@_closed", Qtrue);
 
+  if (ZKRBDebugging) fprintf(stderr, "calling destroy_zkrb_instance\n");
 
   /* Note that after zookeeper_close() returns, ZK handle is invalid */
   int rc = destroy_zkrb_instance(zk);
 
+  if (ZKRBDebugging) fprintf(stderr, "destroy_zkrb_instance returned: %d\n", rc);
+
   return INT2FIX(rc);
 }
 

data/ext/zookeeper_lib.c

@@ -16,6 +16,7 @@ wickman@twitter.com
 #include <stdlib.h>
 #include <pthread.h>
 #include <unistd.h>
+#include <inttypes.h>
 
 #define GET_SYM(str) ID2SYM(rb_intern(str))
 
@@ -56,9 +57,6 @@ void zkrb_enqueue(zkrb_queue_t *q, zkrb_event_t *elt) {
     if ((ret == -1)) {
       fprintf(stderr, "WARNING: write to queue (%p) pipe failed!\n", q);
     }
-/*    else {*/
-/*      fprintf(stderr, "successfully enqueued event on queue (%p)\n", q);*/
-/*    }*/
   }
 }
 
@@ -283,17 +281,17 @@ VALUE zkrb_event_to_ruby(zkrb_event_t *event) {
 void zkrb_print_stat(const struct Stat *s) {
   fprintf(stderr,  "stat {\n");
   if (s != NULL) {
-    fprintf(stderr,  "\t          czxid: %lld\n", s->czxid);
-    fprintf(stderr,  "\t          mzxid: %lld\n", s->mzxid);
-    fprintf(stderr,  "\t          ctime: %lld\n", s->ctime);
-    fprintf(stderr,  "\t          mtime: %lld\n", s->mtime);
-    fprintf(stderr,  "\t        version: %d\n"  , s->version);
-    fprintf(stderr,  "\t       cversion: %d\n"  , s->cversion);
-    fprintf(stderr,  "\t       aversion: %d\n"  , s->aversion);
-    fprintf(stderr,  "\t ephemeralOwner: %lld\n", s->ephemeralOwner);
-    fprintf(stderr,  "\t     dataLength: %d\n"  , s->dataLength);
-    fprintf(stderr,  "\t    numChildren: %d\n"  , s->numChildren);
-    fprintf(stderr,  "\t          pzxid: %lld\n", s->pzxid);
+    fprintf(stderr,  "\t          czxid: %"PRId64"\n", s->czxid);   // PRId64 defined in inttypes.h
+    fprintf(stderr,  "\t          mzxid: %"PRId64"\n", s->mzxid);
+    fprintf(stderr,  "\t          ctime: %"PRId64"\n", s->ctime);
+    fprintf(stderr,  "\t          mtime: %"PRId64"\n", s->mtime);
+    fprintf(stderr,  "\t        version: %d\n",        s->version);
+    fprintf(stderr,  "\t       cversion: %d\n",        s->cversion);
+    fprintf(stderr,  "\t       aversion: %d\n",        s->aversion);
+    fprintf(stderr,  "\t ephemeralOwner: %"PRId64"\n", s->ephemeralOwner);
+    fprintf(stderr,  "\t     dataLength: %d\n",        s->dataLength);
+    fprintf(stderr,  "\t    numChildren: %d\n",        s->numChildren);
+    fprintf(stderr,  "\t          pzxid: %"PRId64"\n", s->pzxid);
   } else {
     fprintf(stderr, "\tNULL\n");
   }
@@ -309,7 +307,7 @@ zkrb_calling_context *zkrb_calling_context_alloc(int64_t req_id, zkrb_queue_t *q
 
 void zkrb_print_calling_context(zkrb_calling_context *ctx) {
   fprintf(stderr, "calling context (%p){\n", ctx);
-  fprintf(stderr, "\treq_id = %lld\n", ctx->req_id);
+  fprintf(stderr, "\treq_id = %"PRId64"\n", ctx->req_id);
   fprintf(stderr, "\tqueue  = %p\n", ctx->queue);
   fprintf(stderr, "}\n");
 }

data/lib/zookeeper/em_client.rb

@@ -37,29 +37,28 @@ module ZookeeperEM
     def close(&block)
       on_close(&block)
 
-        logger.debug { "close called, closed? #{closed?} running? #{running?}" }
+      logger.debug { "#{self.class.name}: close called, closed? #{closed?} running? #{running?}" }
 
       if @_running
         @start_stop_mutex.synchronize do
           @_running = false
         end
 
-        @em_connection.detach if @em_connection
-        @em_connection = nil
-
-        unless @_closed
-          @start_stop_mutex.synchronize do
-            logger.debug { "closing handle" }
-            close_handle
+        if @em_connection
+          EM.next_tick do
+            @em_connection.detach do
+              logger.debug { "#{self.class.name}: connection unbound, continuing with shutdown" }
+              finish_closing
+            end
           end
-
-          selectable_io.close unless selectable_io.closed?
+        else
+          logger.debug { "#{self.class.name}: em_connection was never set up, finish closing" }
+          finish_closing
         end
       else
-        logger.debug { "we are not running, so returning on_close deferred" }
+        logger.debug { "#{self.class.name}: we are not running, so returning on_close deferred" }
       end
 
-      on_close.succeed
       on_close
     end
 
@@ -73,14 +72,30 @@ module ZookeeperEM
       EM.schedule do
         if running? and not closed?
           begin
+            logger.debug { "adding EM.watch(#{selectable_io.inspect})" }
             @em_connection = EM.watch(selectable_io, ZKConnection, self) { |cnx| cnx.notify_readable = true }
           rescue Exception => e
             $stderr.puts "caught exception from EM.watch(): #{e.inspect}"
           end
-          on_attached.succeed
         end
       end
     end
+
+    def finish_closing
+      unless @_closed
+        @start_stop_mutex.synchronize do
+          logger.debug { "closing handle" }
+          close_handle
+        end
+
+        unless selectable_io.closed?
+          logger.debug { "calling close on selectable_io: #{selectable_io.inspect}" }
+          selectable_io.close
+        end
+      end
+
+      on_close.succeed
+    end
   end
 
   # this class is handed to EventMachine.watch to handle event dispatching
@@ -94,24 +109,53 @@ module ZookeeperEM
 
     def initialize(zk_client)
       @zk_client = zk_client
+    end
+
+    def post_init
+      logger.debug { "post_init called" }
       @attached = true
+
+      @on_unbind = EM::DefaultDeferrable.new.tap do |d|
+        d.callback do
+          logger.debug { "on_unbind deferred fired" }
+        end
+      end
+
+      # probably because of the way post_init works, unless we fire this
+      # callback in next_tick @em_connection in the client may not be set
+      # (which on_attached callbacks may be relying on)
+      EM.next_tick do 
+        logger.debug { "firing on_attached callback" }
+        @zk_client.on_attached.succeed
+      end
+    end
+    
+    # EM::DefaultDeferrable that will be called back when our em_connection has been detached
+    # and we've completed the close operation
+    def on_unbind(&block)
+      @on_unbind.callback(&block) if block
+      @on_unbind
     end
 
     def attached?
       @attached
     end
 
-    def detach
+    def unbind
+      on_unbind.succeed
+    end
+
+    def detach(&blk)
+      on_unbind(&blk)
       return unless @attached
       @attached = false
-      super
-      logger.debug { "#{self.class.name}: detached" }
+      rval = super()
+      logger.debug { "#{self.class.name}: detached, rval: #{rval.inspect}" }
     end
 
     # we have an event waiting
     def notify_readable
       if @zk_client.running?
-#         logger.debug { "#{self.class.name}: dispatching events while #{@zk_client.running?}" }
 
         read_io_nb if @zk_client.dispatch_next_callback(false)
 

data/slyphon-zookeeper.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "slyphon-zookeeper"
-  s.version     = '0.2.3'
+  s.version     = '0.2.4'
 
   s.authors     = ["Phillip Pearson", "Eric Maland", "Evan Weaver", "Brian Wickman", "Neil Conway", "Jonathan D. Simms"]
   s.email       = ["slyphon@gmail.com"]

data/spec/em_spec.rb

@@ -20,7 +20,12 @@ describe 'ZookeeperEM' do
     end
 
     def teardown_and_done
-      @zk.close { done }
+      @zk.close do 
+        logger.debug { "TEST: about to call done" }
+        EM.next_tick do
+          done
+        end
+      end
     end
 
     describe 'selectable_io' do
@@ -55,37 +60,6 @@ describe 'ZookeeperEM' do
           teardown_and_done
         end
       end
-
-      it %[should not be read-ready if there's no event] do
-        pending "get this to work in jruby" if defined?(::JRUBY_VERSION)
-        # there's always an initial event after connect
-        
-        # except in jruby
-#         if defined?(::JRUBY_VERSION)
-#           @zk.get(:path => '/', :callback => @data_cb)
-#         end
-
-        setup_zk do
-          events = 0
-
-          while true
-            r, *_ = IO.select([@zk.selectable_io], [], [], 0.2)
-
-            break unless r
-
-            h = @zk.get_next_event(false)
-            @zk.selectable_io.read(1)
-
-            events += 1
-
-            h.should be_kind_of(Hash)
-          end
-
-          events.should == 1
-
-          teardown_and_done
-        end
-      end
     end
 
     describe 'em_connection' do

data/spec/spec_helper.rb

@@ -13,6 +13,14 @@ Zookeeper.logger = Logger.new(File.expand_path('../../test.log', __FILE__)).tap
   log.level = Logger::DEBUG
 end
 
+
+# NOTE: this is a useful debugging setup. have our logs and the low-level C
+# logging statements both go to stderr. to use, comment the above and uncomment
+# below
+
+# Zookeeper.logger = Logger.new($stderr).tap { |l| l.level = Logger::DEBUG }
+# Zookeeper.set_debug_level(4)
+
 def logger
   Zookeeper.logger
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slyphon-zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Phillip Pearson
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-27 00:00:00 +00:00
+date: 2011-06-29 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency