zookeeper 1.1.1 → 1.1.2

data/ext/c_zookeeper.rb

@@ -156,7 +156,7 @@ class CZookeeper
 
   def state
     return ZOO_CLOSED_STATE if closed?
-    zkrb_state
+    submit_and_block(:state)
   end
 
   # this implementation is gross, but i don't really see another way of doing it
@@ -176,13 +176,21 @@ class CZookeeper
     connected?
   end
 
-
   private
     # submits a job for processing 
     # blocks the caller until result has returned
     def submit_and_block(meth, *args)
       cnt = Continuation.new(meth, *args)
-      @reg.synchronized { |r| r.pending << cnt }
+      @reg.lock 
+      begin
+        if meth == :state
+          @reg.pending.unshift(cnt)
+        else
+          @reg.pending << cnt
+        end
+      ensure
+        @reg.unlock rescue nil
+      end
       wake_event_loop!
       cnt.value
     end
@@ -232,10 +240,8 @@ class CZookeeper
 
       # this is the main loop
       until (@_shutting_down or @_closed or is_unrecoverable)
-        submit_pending_calls    if @reg.pending?
-#         log_realtime("zkrb_iterate_event_loop") do
-          zkrb_iterate_event_loop # XXX: check rc here
-#         end
+        submit_pending_calls    if @reg.anything_to_do?
+        zkrb_iterate_event_loop 
         iterate_event_delivery
       end
 
@@ -260,31 +266,20 @@ class CZookeeper
     end
 
     def submit_pending_calls
-      # this is ok, because the calling thread only ever *adds* to this hash,
-      # and the keys are always unique
+      calls = @reg.next_batch()
 
-      pending = nil
+      return if calls.empty?
 
-      @reg.lock
-      begin
-        pending, @reg.pending = @reg.pending, []
-      ensure
-        @reg.unlock
-      end
-
-      return if pending.empty?
-
-      logger.debug { "#{self.class}##{__method__} " }
-
-      while cntn = pending.shift
-        cntn.submit(self)
-        @reg.in_flight[cntn.req_id] = cntn   # in_flight is only ever touched by us
+      while cntn = calls.shift
+        cntn.submit(self)                     # this delivers state check results (and does other stuff)
+        if req_id = cntn.req_id               # state checks will not have a req_id
+          @reg.in_flight[req_id] = cntn       # in_flight is only ever touched by us
+        end
       end
     end
 
     def wake_event_loop!
-      logger.debug { "#{self.class}##{__method__}" }
-      @pipe_write && @pipe_write.write("\001")
+      @pipe_write && @pipe_write.write('1')
     end
 
     def iterate_event_delivery

data/ext/common.h

@@ -1,7 +1,17 @@
 #ifndef ZKRB_COMMON_H
 #define ZKRB_COMMON_H
 
+#include "ruby.h"
+
 //#define THREADED
 #undef THREADED    // we are linking against the zookeeper_st lib, this is crucial
 
+#ifndef RB_GC_GUARD_PTR
+#define RB_GC_GUARD_PTR(V) (V);
+#endif
+#ifndef RB_GC_GUARD
+#define RB_GC_GUARD(V) (V);
+#endif
+
+
 #endif /* ZKRB_COMMON_H */

data/ext/zkrb.c

@@ -56,6 +56,13 @@
  *
  * NOTE: This file depends on exception classes defined in lib/zookeeper/exceptions.rb
  *
+ * -------
+ *
+ * @rectalogic: any time you create a ruby value in C, and so there are no
+ * references to it in the VM except for your variable, and you then call into
+ * the VM (allowing a GC), and your reference is on the stack, then it needs to
+ * be volatile
+ *
  */
 
 #include "ruby.h"
@@ -269,7 +276,7 @@ static VALUE method_zkrb_init(int argc, VALUE* argv, VALUE self) {
     zoo_set_debug_level(FIX2INT(log_level));
   }
 
-  VALUE data;
+  volatile VALUE data;
   zkrb_instance_data_t *zk_local_ctx;
   data = Data_Make_Struct(CZookeeper, zkrb_instance_data_t, 0, free_zkrb_instance_data, zk_local_ctx);
 
@@ -665,13 +672,12 @@ static VALUE method_zkrb_get_next_event(VALUE self, VALUE blocking) {
     check_debug(!is_closed(self), "we're closed in the middle of method_zkrb_get_next_event, bailing");
 
     zkrb_event_t *event = zkrb_dequeue(zk->queue, 1);
-
-    /* Wait for an event using rb_thread_select() on the queue's pipe */
+    
     if (event == NULL) {
       if (NIL_P(blocking) || (blocking == Qfalse)) { 
         goto error;
       } 
-      else {
+      else { 
         // if we're shutting down, don't enter this section, we don't want to block
         check_debug(!is_shutting_down(self), "method_zkrb_get_next_event, we're shutting down, don't enter blocking section");
 
@@ -707,7 +713,7 @@ static VALUE method_zkrb_get_next_event(VALUE self, VALUE blocking) {
 // the single threaded version of this call. will go away when we do direct
 // event delivery (soon)
 static VALUE method_zkrb_get_next_event_st(VALUE self) {
-  VALUE rval = Qnil;
+  volatile VALUE rval = Qnil;
 
   if (is_closed(self)) {
     zkrb_debug("we are closed, not gonna try to get an event");

data/lib/zookeeper/continuation.rb

@@ -8,6 +8,10 @@ module Zookeeper
 
     # for keeping track of which continuations are pending, and which ones have
     # been submitted and are awaiting a repsonse
+    # 
+    # `state_check` are high-priority checks that query the connection about
+    # its current state, they always run before other continuations
+    #
     class Registry < Struct.new(:pending, :in_flight)
       extend Forwardable
 
@@ -23,15 +27,26 @@ module Zookeeper
         begin
           yield self
         ensure
-          @mutex.unlock
+          @mutex.unlock rescue nil
         end
       end
 
       # does not lock the mutex, returns true if there are pending jobs
-      def pending?
-        !self.pending.empty?
+      def anything_to_do?
+        !pending.empty?
       end
-    end
+
+      # returns the pending continuations, resetting the list
+      # this method is synchronized
+      def next_batch()
+        @mutex.lock
+        begin
+          pending.slice!(0,pending.length)
+        ensure
+          @mutex.unlock rescue nil
+        end
+      end
+    end # Registry
 
     # *sigh* what is the index in the *args array of the 'callback' param
     CALLBACK_ARG_IDX = {
@@ -43,6 +58,7 @@ module Zookeeper
       :get_acl => 2,
       :set_acl => 3,
       :get_children => 2,
+      :state => 0,
     }
     
     # maps the method name to the async return hash keys it should use to
@@ -111,9 +127,10 @@ module Zookeeper
     def submit(czk)
       rc, *_ = czk.__send__(:"zkrb_#{@meth}", *async_args)
       
-      if user_callback? or (rc != ZOK)      # if this is an async call, or we failed to submit it
-        @rval = [rc]                        # create the repsonse
-        deliver!                            # wake the caller and we're out
+      # if this is an state call, async call, or we failed to submit it
+      if (@meth == :state) or user_callback? or (rc != ZOK)
+        @rval = [rc]           # create the repsonse
+        deliver!               # wake the caller and we're out
       end
     end
 
@@ -121,11 +138,16 @@ module Zookeeper
       @args.first
     end
 
+    def state_call?
+      @meth == :state
+    end
+
     protected
 
       # an args array with the only difference being that if there's a user
       # callback provided, we don't handle delivering the end result
       def async_args
+        return [] if @meth == :state    # special-case :P
         ary = @args.dup
 
         logger.debug { "async_args, meth: #{meth} ary: #{ary.inspect}, #{callback_arg_idx}" }
@@ -147,7 +169,7 @@ module Zookeeper
         begin
           @cond.signal
         ensure
-          @mutex.unlock
+          @mutex.unlock rescue nil
         end
       end
   end # Base

data/lib/zookeeper/version.rb

@@ -1,4 +1,4 @@
 module Zookeeper
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
   DRIVER_VERSION = '3.3.5'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Phillip Pearson
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-15 00:00:00 Z
+date: 2012-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: backports