slyphon-zookeeper 0.2.5 → 0.2.7

data/ext/dbg.h

@@ -0,0 +1,37 @@
+#ifndef __dbg_h__
+#define __dbg_h__
+
+// ALL GLORY TO THE Zed A. Shaw
+// http://c.learncodethehardway.org/book/learn-c-the-hard-waych21.html#x26-10500021
+
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+
+#ifdef NDEBUG
+#define debug(M, ...)
+#else
+#define debug(M, ...) fprintf(stderr, "DEBUG %s:%d: " M "\n", __FILE__, __LINE__, ##__VA_ARGS__)
+#endif
+
+#define clean_errno() (errno == 0 ? "None" : strerror(errno))
+
+#define log_err(M, ...) fprintf(stderr, "[ERROR] (%s:%d: errno: %s) " M "\n", __FILE__, __LINE__, clean_errno(), ##__VA_ARGS__) 
+
+#define log_warn(M, ...) fprintf(stderr, "[WARN] (%s:%d: errno: %s) " M "\n", __FILE__, __LINE__, clean_errno(), ##__VA_ARGS__) 
+
+#define log_info(M, ...) fprintf(stderr, "[INFO] (%s:%d) " M "\n", __FILE__, __LINE__, ##__VA_ARGS__) 
+
+#define check(A, M, ...) if(!(A)) { log_err(M, ##__VA_ARGS__); errno=0; goto error; } 
+
+#define sentinel(M, ...)  { log_err(M, ##__VA_ARGS__); errno=0; goto error; } 
+
+#define check_mem(A) check((A), "Out of memory.")
+
+#define check_debug(A, M, ...) if(!(A)) { debug(M, ##__VA_ARGS__); errno=0; goto error; } 
+
+#define zkrb_debug(M, ...) if (ZKRBDebugging) fprintf(stderr, "DEBUG %s:%d: " M "\n", __FILE__, __LINE__, ##__VA_ARGS__)
+#define zkrb_debug_inst(O, M, ...) zkrb_debug("obj_id: %lx, " M, FIX2LONG(rb_obj_id(O)), ##__VA_ARGS__)
+
+#endif
+

data/ext/depend

@@ -0,0 +1,4 @@
+zookeeper_c.c:	zookeeper_lib.c dbg.h
+
+zookeeper_lib.c:	zookeeper_lib.h
+

data/ext/extconf.rb

@@ -11,12 +11,14 @@ $LDFLAGS = "#{RbConfig::CONFIG['LDFLAGS']} #{$LDFLAGS}".gsub("$(ldflags)", "").g
 $CXXFLAGS = " -std=gnu++98 #{$CFLAGS}"
 $CPPFLAGS = $ARCH_FLAG = $DLDFLAGS = ""
 
+ZK_DEBUG = (ENV['DEBUG'] or ARGV.any? { |arg| arg == '--debug' })
+DEBUG_CFLAGS = " -O0 -ggdb3 -DHAVE_DEBUG"
 
-if ENV['DEBUG']
+if ZK_DEBUG
   $stderr.puts "*** Setting debug flags. ***"
-  $CFLAGS << " -O0 -ggdb3 -DHAVE_DEBUG"
   $EXTRA_CONF = " --enable-debug"
   $CFLAGS.gsub!(/ -O[^0] /, ' ')
+  $CFLAGS << DEBUG_CFLAGS
 end
 
 $includes = " -I#{HERE}/include"
@@ -46,7 +48,11 @@ Dir.chdir(HERE) do
     end
 
     Dir.chdir(BUNDLE_PATH) do        
-      safe_sh("./configure --prefix=#{HERE} --with-pic --without-cppunit --disable-dependency-tracking #{$EXTRA_CONF} 2>&1")
+      configure = "./configure --prefix=#{HERE} --with-pic --without-cppunit --disable-dependency-tracking #{$EXTRA_CONF} 2>&1"
+      
+      configure = "env CFLAGS='#{DEBUG_CFLAGS}' #{configure}" if ZK_DEBUG
+
+      safe_sh(configure)
       safe_sh("make  2>&1")
       safe_sh("make install 2>&1")
     end
@@ -62,4 +68,6 @@ Dir.chdir("#{HERE}/lib") do
 end
 $LIBS << " -lzookeeper_mt_gem"
 
+
 create_makefile 'zookeeper_c'
+

data/ext/zookeeper_base.rb

@@ -28,6 +28,7 @@ class ZookeeperBase < CZookeeper
     end
 
     @start_stop_mutex.synchronize do
+#       $stderr.puts "%s: calling init, self.obj_id: %x" % [self.class, object_id]
       init(@host)
 
       if timeout > 0

data/ext/zookeeper_c.c

@@ -22,7 +22,7 @@
 #include <inttypes.h>
 
 #include "zookeeper_lib.h"
-
+#include "dbg.h"
 
 static VALUE Zookeeper = Qnil;
 
@@ -32,6 +32,7 @@ struct zkrb_instance_data {
   zhandle_t            *zh;
   clientid_t          myid;
   zkrb_queue_t      *queue;
+  long              object_id; // the ruby object this instance data is associated with
 };
 
 typedef enum {
@@ -44,23 +45,28 @@ typedef enum {
 #define IS_SYNC(zkrbcall) ((zkrbcall)==SYNC || (zkrbcall)==SYNC_WATCH)
 #define IS_ASYNC(zkrbcall) ((zkrbcall)==ASYNC || (zkrbcall)==ASYNC_WATCH)
 
+
 static int destroy_zkrb_instance(struct zkrb_instance_data* ptr) {
   int rv = ZOK;
 
   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"); 
+    zkrb_debug("obj_id: %lx, calling zookeeper_close", ptr->object_id);
     rv = zookeeper_close(ptr->zh);
-    if (ZKRBDebugging) fprintf(stderr, "zookeeper_close returned %d\n", rv); 
+    zkrb_debug("obj_id: %lx, zookeeper_close returned %d", ptr->object_id, rv); 
     free((void *) ctx);
   }
 
 #warning [wickman] TODO: fire off warning if queue is not empty
-  if (ptr->queue) zkrb_queue_free(ptr->queue);
+  if (ptr->queue) {
+    zkrb_debug("obj_id: %lx, freeing queue pointer: %p", ptr->object_id, ptr->queue);
+    zkrb_queue_free(ptr->queue);
+  }
 
   ptr->zh = NULL;
   ptr->queue = NULL;
+
   return rv;
 }
 
@@ -70,10 +76,11 @@ static void free_zkrb_instance_data(struct zkrb_instance_data* ptr) {
 
 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 = %"PRId64"\n",    ptr->myid.client_id);   // PRId64 defined in inttypes.h
-  fprintf(stderr, "    q = %p\n",           ptr->queue);
+  fprintf(stderr, "      zh = %p\n",           ptr->zh);
+  fprintf(stderr, "        { state = %d }\n",  zoo_state(ptr->zh));
+  fprintf(stderr, "      id = %"PRId64"\n",    ptr->myid.client_id);   // PRId64 defined in inttypes.h
+  fprintf(stderr, "       q = %p\n",           ptr->queue);
+  fprintf(stderr, "  obj_id = %lx\n",          ptr->object_id);
   fprintf(stderr, "}\n");
 }
 
@@ -154,6 +161,8 @@ static VALUE method_init(int argc, VALUE* argv, VALUE self) {
   zkrb_calling_context *ctx =
     zkrb_calling_context_alloc(ZKRB_GLOBAL_REQ, zk_local_ctx->queue);
 
+  zk_local_ctx->object_id = FIX2LONG(rb_obj_id(self));
+
   zk_local_ctx->zh =
       zookeeper_init(
           RSTRING_PTR(hostPort),
@@ -168,7 +177,7 @@ static VALUE method_init(int argc, VALUE* argv, VALUE self) {
     rb_raise(rb_eRuntimeError, "error connecting to zookeeper: %d", errno);
   }
 
-  rb_iv_set(self, "@data", data);
+  rb_iv_set(self, "@_data", data);
   rb_iv_set(self, "@selectable_io", create_selectable_io(zk_local_ctx->queue));
   rb_iv_set(self, "@_running", Qtrue);
 
@@ -178,7 +187,7 @@ static VALUE method_init(int argc, VALUE* argv, VALUE self) {
 
 #define FETCH_DATA_PTR(x, y)                                            \
   struct zkrb_instance_data * y;                                        \
-  Data_Get_Struct(rb_iv_get(x, "@data"), struct zkrb_instance_data, y); \
+  Data_Get_Struct(rb_iv_get(x, "@_data"), struct zkrb_instance_data, y); \
   if ((y)->zh == NULL)                                                  \
     rb_raise(rb_eRuntimeError, "zookeeper handle is closed")
 
@@ -189,7 +198,7 @@ static VALUE method_init(int argc, VALUE* argv, VALUE self) {
   }                                                                     \
   Check_Type(path, T_STRING);                                           \
   struct zkrb_instance_data * zk;                                       \
-  Data_Get_Struct(rb_iv_get(self, "@data"), struct zkrb_instance_data, zk); \
+  Data_Get_Struct(rb_iv_get(self, "@_data"), struct zkrb_instance_data, zk); \
   if (!zk->zh)                                                          \
     rb_raise(rb_eRuntimeError, "zookeeper handle is closed");           \
   zkrb_calling_context* cb_ctx =                                        \
@@ -489,7 +498,7 @@ static VALUE method_get_next_event(VALUE self, VALUE blocking) {
     // ruby-land semaphore that we can also use in the java extension
     //
     if (is_closed(self) || !is_running(self)) {
-/*      fprintf(stderr, "method_get_next_event: running is false, returning nil\n");*/
+      zkrb_debug_inst(self, "is_closed(self): %d, is_running(self): %d, method_get_next_event is exiting loop", is_closed(self), is_running(self));
       return Qnil;  // this case for shutdown
     }
 
@@ -512,9 +521,8 @@ static VALUE method_get_next_event(VALUE self, VALUE blocking) {
         if (bytes_read == -1) {
           rb_raise(rb_eRuntimeError, "read failed: %d", errno);
         }
-        else if (ZKRBDebugging) {
-          fprintf(stderr, "read %zd bytes from the queue (%p)'s pipe\n", bytes_read, zk->queue);
-        }
+
+        zkrb_debug_inst(self, "read %zd bytes from the queue (%p)'s pipe", bytes_read, zk->queue);
 
         continue;
       }
@@ -545,6 +553,7 @@ static VALUE method_client_id(VALUE self) {
 static VALUE method_wake_event_loop_bang(VALUE self) {
   FETCH_DATA_PTR(self, zk); 
 
+  zkrb_debug_inst(self, "Waking event loop: %p", zk->queue);
   zkrb_signal(zk->queue);
 
   return Qnil;
@@ -563,7 +572,8 @@ static VALUE method_close_handle(VALUE self) {
   FETCH_DATA_PTR(self, zk);
 
   if (ZKRBDebugging) {
-    fprintf(stderr, "CLOSING ZK INSTANCE:");
+/*    fprintf(stderr, "CLOSING ZK INSTANCE: obj_id %lx", FIX2LONG(rb_obj_id(self)));*/
+    zkrb_debug_inst(self, "CLOSING_ZK_INSTANCE");
     print_zkrb_instance_data(zk);
   }
   
@@ -571,14 +581,15 @@ 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");
+  zkrb_debug_inst(self, "calling destroy_zkrb_instance");
 
   /* 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);
+  zkrb_debug("destroy_zkrb_instance returned: %d", rc);
 
-  return INT2FIX(rc);
+  return Qnil;
+/*  return INT2FIX(rc);*/
 }
 
 static VALUE method_deterministic_conn_order(VALUE self, VALUE yn) {
@@ -657,3 +668,5 @@ void Init_zookeeper_c() {
   Zookeeper = rb_define_class("CZookeeper", rb_cObject);
   zkrb_define_methods();
 }
+
+// vim:ts=2:sw=2:sts=2:et

data/ext/zookeeper_lib.c

@@ -17,6 +17,7 @@ wickman@twitter.com
 #include <pthread.h>
 #include <unistd.h>
 #include <inttypes.h>
+#include "dbg.h"
 
 #define GET_SYM(str) ID2SYM(rb_intern(str))
 
@@ -29,7 +30,7 @@ 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.
+ * [BUG], corrupt the stack, kill your dog, knock up your daughter, etc. etc.
  *
  *********************************************************************************
 */
@@ -53,10 +54,8 @@ void zkrb_enqueue(zkrb_queue_t *q, zkrb_event_t *elt) {
   // 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);
-    }
+  if ((ret == -1)) {
+    fprintf(stderr, "WARNING: write to queue (%p) pipe failed!\n", q);
   }
 }
 
@@ -93,7 +92,7 @@ void zkrb_signal(zkrb_queue_t *q) {
   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);
+    log_err("write to pipe failed");
 }
 
 zkrb_queue_t *zkrb_queue_alloc(void) {

data/lib/zookeeper/em_client.rb

@@ -11,6 +11,7 @@ module ZookeeperEM
       @on_close       = EM::DefaultDeferrable.new
       @on_attached    = EM::DefaultDeferrable.new
       @em_connection  = nil
+      logger.debug { "ZookeeperEM::Client obj_id %x: init" % [object_id] }
       super(*a, &b)
     end
 

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

metadata

@@ -1,10 +1,15 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: slyphon-zookeeper
-version: !ruby/object:Gem::Version
-  version: 0.2.5
+version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 7
+  version: 0.2.7
 platform: ruby
-authors:
+authors: 
 - Phillip Pearson
 - Eric Maland
 - Evan Weaver
@@ -14,60 +19,85 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-11-17 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70134739892840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
   type: :development
-  prerelease: false
-  version_requirements: *70134739892840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: flexmock
-  requirement: &70134739892020 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 0
+        - 8
+        - 11
         version: 0.8.11
   type: :development
-  prerelease: false
-  version_requirements: *70134739892020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: eventmachine
-  requirement: &70134739891420 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 62196363
+        segments: 
+        - 1
+        - 0
+        - 0
+        - beta
+        - 4
         version: 1.0.0.beta.4
   type: :development
-  prerelease: false
-  version_requirements: *70134739891420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: evented-spec
-  requirement: &70134739890760 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
         version: 0.9.0
   type: :development
-  prerelease: false
-  version_requirements: *70134739890760
+  version_requirements: *id004
 description: twitter's zookeeper client
-email:
+email: 
 - slyphon@gmail.com
 executables: []
-extensions:
+
+extensions: 
 - ext/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - CHANGELOG
 - Gemfile
@@ -78,6 +108,8 @@ files:
 - examples/cloud_config.rb
 - ext/.gitignore
 - ext/Rakefile
+- ext/dbg.h
+- ext/depend
 - ext/extconf.rb
 - ext/zkc-3.3.3.tar.gz
 - ext/zookeeper_base.rb
@@ -108,30 +140,39 @@ files:
 - test/test_watcher2.rb
 homepage: https://github.com/slyphon/zookeeper
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: twitter's zookeeper client
-test_files:
+test_files: 
 - spec/default_watcher_spec.rb
 - spec/em_spec.rb
 - spec/log4j.properties