slyphon-zookeeper 0.2.0-java → 0.2.1-java

data/ext/extconf.rb

@@ -12,7 +12,7 @@ $CXXFLAGS = " -std=gnu++98 #{$CFLAGS}"
 $CPPFLAGS = $ARCH_FLAG = $DLDFLAGS = ""
 
 if ENV['DEBUG']
-  puts "Setting debug flags."
+  $stderr.puts "*** Setting debug flags. ***"
   $CFLAGS << " -O0 -ggdb3 -DHAVE_DEBUG"
   $EXTRA_CONF = " --enable-debug"
   $CFLAGS.gsub!(/ -O[^0] /, ' ')

data/ext/zookeeper_base.rb

@@ -87,22 +87,24 @@ class ZookeeperBase < CZookeeper
     end
 
     if @dispatcher
-      wake_event_loop! unless @_closed
+      unless @_closed
+        wake_event_loop! 
+      end
       @dispatcher.join 
     end
 
     @start_stop_mutex.synchronize do
       unless @_closed
         close_handle
-        
-        # this is set up in the C init method, but it's easier to 
-        # do the teardown here
-        begin
-          @selectable_io.close if @selectable_io
-        rescue IOError
-        end
       end
     end
+        
+    # this is set up in the C init method, but it's easier to 
+    # do the teardown here
+    begin
+      @selectable_io.close if @selectable_io
+    rescue IOError
+    end
   end
 
   def set_debug_level(int)
@@ -126,7 +128,19 @@ class ZookeeperBase < CZookeeper
     @start_stop_mutex.synchronize { false|@_running }
   end
 
+  def state
+    return ZOO_CLOSED_STATE if closed?
+    super
+  end
+
 protected
+  def barf_unless_running!
+    @start_stop_mutex.synchronize do
+      raise ShuttingDownException unless (@_running and not @_closed)
+      yield
+    end
+  end
+
   def setup_dispatch_thread!
     @dispatcher = Thread.new do
       while running?

data/ext/zookeeper_c.c

@@ -472,6 +472,10 @@ static int is_running(VALUE self) {
   return RTEST(rval);
 }
 
+static int is_closed(VALUE self) {
+  VALUE rval = rb_iv_get(self, "@_closed");
+  return RTEST(rval);
+}
 
 /* slyphon: NEED TO PROTECT THIS AGAINST SHUTDOWN */
 
@@ -484,7 +488,7 @@ static VALUE method_get_next_event(VALUE self, VALUE blocking) {
     // we use the is_running(self) method here because it allows us to have a
     // ruby-land semaphore that we can also use in the java extension
     //
-    if (!is_running(self)) {
+    if (is_closed(self) || !is_running(self)) {
 /*      fprintf(stderr, "method_get_next_event: running is false, returning nil\n");*/
       return Qnil;  // this case for shutdown
     }
@@ -517,7 +521,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's pipe\n", bytes_read);
+          fprintf(stderr, "read %d bytes from the queue (%p)'s pipe\n", bytes_read, zk->queue);
         }
 
         continue;

data/ext/zookeeper_lib.c

@@ -23,6 +23,16 @@ int ZKRBDebugging;
 
 pthread_mutex_t zkrb_q_mutex = PTHREAD_MUTEX_INITIALIZER;
 
+
+/********************************************************************************
+ *
+ * NOTE: be *very careful* in these functions, calling *ANY* ruby interpreter
+ * function when you're not in an interpreter thread can hork ruby, trigger a
+ * [BUG], corrupt the stack, kill you dog, knock up your daughter, etc. etc.
+ *
+ *********************************************************************************
+*/
+
 /* push/pop is a misnomer, this is a queue */
 void zkrb_enqueue(zkrb_queue_t *q, zkrb_event_t *elt) {
   pthread_mutex_lock(&zkrb_q_mutex);
@@ -37,8 +47,19 @@ void zkrb_enqueue(zkrb_queue_t *q, zkrb_event_t *elt) {
   q->tail->next = NULL;
   ssize_t ret = write(q->pipe_write, "0", 1);   /* Wake up Ruby listener */
   pthread_mutex_unlock(&zkrb_q_mutex);
-  if (ret == -1)
-    rb_raise(rb_eRuntimeError, "write to pipe failed: %d", errno);
+
+  // XXX(slyphon): can't raise a ruby exception here as we may not be calling
+  // this from a ruby thread. Calling into the interpreter from a non-ruby
+  // thread is bad, mm'kay?
+
+  if (ZKRBDebugging) {
+    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);*/
+/*    }*/
+  }
 }
 
 zkrb_event_t * zkrb_peek(zkrb_queue_t *q) {
@@ -79,6 +100,9 @@ void zkrb_signal(zkrb_queue_t *q) {
 
 zkrb_queue_t *zkrb_queue_alloc(void) {
   int pfd[2];
+
+  // XXX(slyphon): close-on-exec settings?
+
   if (pipe(pfd) == -1)
     rb_raise(rb_eRuntimeError, "create of pipe failed: %d", errno);
 

data/lib/zookeeper.rb

@@ -1,6 +1,7 @@
 # Ruby wrapper for the Zookeeper C API
 
 require 'thread'
+require 'monitor'
 require 'zookeeper/common'
 require 'zookeeper/constants'
 require 'zookeeper/callbacks'

data/lib/zookeeper/exceptions.rb

@@ -56,6 +56,7 @@ module ZookeeperExceptions
     # these are Ruby client exceptions
     class ConnectionClosed        < ZookeeperException; end
     class NotConnected            < ZookeeperException; end 
+    class ShuttingDownException   < ZookeeperException; end
     
     def self.by_code(code)
       case code

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.0'
+  s.version     = '0.2.1'
 
   s.authors     = ["Phillip Pearson", "Eric Maland", "Evan Weaver", "Brian Wickman", "Neil Conway", "Jonathan D. Simms"]
   s.email       = ["slyphon@gmail.com"]

metadata

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