slyphon-zookeeper 0.9.1-java → 0.9.2-java

data/.gitignore

@@ -6,4 +6,5 @@
 Makefile
 pkg
 zookeeper.gemspec
-Gemfile.lock
+Gemfile.*
+tmp/

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.9.2 More efficient and simpler wrappers for GIL release
+
+  * After a code review by Andrew Wason (rectalogic), use a much simpler
+    technique for creating the arg structs and passing them to the
+    zkrb_gvl_* functions. No malloc(), no free(), no problem.
+
 v0.9.1 see v0.8.4 notes, same patch
 
 v0.9.0 RELEASE THE KRAK..er, GIL!!

data/README.markdown

@@ -7,6 +7,9 @@ such as locks, have a look at [ZK](https://github.com/slyphon/zk) (also
 available is [ZK-EventMachine](https://github.com/slyphon/zk-eventmachine) for
 those who prefer async).
 
+Unfortunately, since this is a fork of twitter/zookeeper, we don't have our own
+Issues tracker. Issues should be filed under [ZK](https://github.com/slyphon/zk/issues).
+
 ## License
 
 Copyright 2008 Phillip Pearson, and 2010 Twitter, Inc. Licensed under the

data/Rakefile

@@ -1,29 +1,62 @@
 # def gemset_name
 #   ENV.fetch('GEM_HOME').split('@').last
 # end
-# 
+
+GEM_FILES = FileList['slyphon-zookeeper-*.gem']
+
 namespace :mb do
-  task :build_gems do
-    sh "rvm 1.8.7 do gem build slyphon-zookeeper.gemspec"
-    ENV['JAVA_GEM'] = '1'
-    sh "rvm 1.8.7 do gem build slyphon-zookeeper.gemspec"
+  namespace :gems do
+    task :build do
+      sh "rvm 1.8.7 do gem build slyphon-zookeeper.gemspec"
+      ENV['JAVA_GEM'] = '1'
+      sh "rvm 1.8.7 do gem build slyphon-zookeeper.gemspec"
+    end
+
+    task :push do
+      GEM_FILES.each do |gem|
+        sh "gem push #{gem}"
+      end
+    end
+
+    task :clean do
+      rm_rf GEM_FILES
+    end
+
+    task :all => [:build, :push, :clean]
   end
 end
 
 gemset_name = 'zookeeper'
 
+directory 'tmp'
+
+# this nonsense w/ tmp and the Gemfile is a bundler optimization
+
+GEMSPEC_LINK = 'tmp/slyphon-zookeeper.gemspec'
+
+file GEMSPEC_LINK => 'tmp' do
+  ln_s '../slyphon-zookeeper.gemspec', GEMSPEC_LINK
+end
 
-%w[1.8.7 1.9.2 1.9.3 jruby rbx].each do |ns_name|
+%w[1.8.7 1.9.2 jruby rbx 1.9.3].each do |ns_name|
   rvm_ruby = (ns_name == 'rbx') ? "rbx-2.0.testing" : ns_name
 
   ruby_with_gemset = "#{rvm_ruby}@#{gemset_name}"
 
   create_gemset_name  = "mb:#{ns_name}:create_gemset"
   clobber_task_name   = "mb:#{ns_name}:clobber"
+  clean_task_name     = "mb:#{ns_name}:clean"
   build_task_name     = "mb:#{ns_name}:build"
   bundle_task_name    = "mb:#{ns_name}:bundle_install"
   rspec_task_name     = "mb:#{ns_name}:run_rspec"
 
+  phony_gemfile_link_name = File.expand_path("tmp/Gemfile.#{ns_name}")
+
+  file phony_gemfile_link_name => GEMSPEC_LINK do
+    # apparently, rake doesn't deal with symlinks intelligently :P
+    ln_s('../Gemfile', phony_gemfile_link_name) unless File.exists?(phony_gemfile_link_name)
+  end
+
   task create_gemset_name do
     sh "rvm #{rvm_ruby} do rvm gemset create #{gemset_name}"
   end
@@ -36,7 +69,15 @@ gemset_name = 'zookeeper'
     end
   end
 
-  task build_task_name => [create_gemset_name, clobber_task_name] do
+  task clean_task_name do
+    unless rvm_ruby == 'jruby'
+      cd 'ext' do
+        sh "rake clean"
+      end
+    end
+  end
+
+  task build_task_name => [create_gemset_name, clean_task_name] do
     unless rvm_ruby == 'jruby'
       cd 'ext' do
         sh "rvm #{ruby_with_gemset} do rake build"
@@ -44,13 +85,12 @@ gemset_name = 'zookeeper'
     end
   end
 
-  task bundle_task_name => build_task_name do
-    rm_f 'Gemfile.lock'
-    sh "rvm #{ruby_with_gemset} do bundle install"
+  task bundle_task_name => [phony_gemfile_link_name, build_task_name] do
+    sh "rvm #{ruby_with_gemset} do bundle install --gemfile #{phony_gemfile_link_name}"
   end
 
   task rspec_task_name => bundle_task_name do
-    sh "rvm #{ruby_with_gemset} do bundle exec rspec spec --fail-fast"
+    sh "rvm #{ruby_with_gemset} do env BUNDLE_GEMFILE=#{phony_gemfile_link_name} bundle exec rspec spec --fail-fast"
   end
 
   task "mb:#{ns_name}" => rspec_task_name
@@ -58,6 +98,23 @@ gemset_name = 'zookeeper'
   task "mb:test_all" => rspec_task_name
 end
 
+task :default => 'mb:1.9.3'
+
+task :clean do
+  rm_rf 'tmp'
+end
+
+# cargo culted from http://blog.flavorjon.es/2009/06/easily-valgrind-gdb-your-ruby-c.html
+VALGRIND_BASIC_OPTS = '--num-callers=50 --error-limit=no --partial-loads-ok=yes --undef-value-errors=no'
+
+task 'valgrind' do
+  cd 'ext' do
+    sh "rake clean build"
+  end
+
+  sh "valgrind #{VALGRIND_BASIC_OPTS} bundle exec rspec spec"
+end
+
 namespace :build do
   task :clean do
     cd 'ext' do

data/ext/Rakefile

@@ -29,6 +29,10 @@ end
 
 ZKRB_WRAPPER = %w[zkrb_wrapper.c zkrb_wrapper.h]
 
+
+task :wrappers => ZKRB_WRAPPER
+
+
 task :clobber => :clean do
   rm_rf %w[Makefile c lib bin include]
 end

data/ext/generate_gvl_code.rb

@@ -35,29 +35,21 @@ we want
                 int valuelen, const struct ACL_vector *acl, int flags,
                 string_completion_t completion, const void *data) {
 
-      int rc;
-      zkrb_zoo_acreate_args_t *ptr = malloc(sizeof(zkrb_zoo_acreate_args_t)); 
-      check_mem(ptr);
-
-      ptr->rc = 0; 
-      ptr->zh = zh; 
-      ptr->path = path; 
-      ptr->value = value;
-      ptr->valuelen = valuelen;
-      ptr->acl = acl;
-      ptr->flags = flags;
-      ptr->completion = completion;
-      ptr->data = data; 
-
-      rb_thread_blocking_region(zkrb_gvl_zoo_acreate, (void *)ptr, RUBY_UBF_IO, 0);
-
-      rc = ptr->rc;
-      free(ptr);
-      return rc;
-
-    error:
-      free(ptr); 
-      return -1;
+    zkrb_zoo_acreate_args_t args = {
+      .rc = ZKRB_FAIL,
+      .zh = zh,
+      .path = path,
+      .value = value,
+      .valuelen = valuelen,
+      .acl = acl,
+      .flags = flags,
+      .completion = completion,
+      .data = data
+    };
+
+    zkrb_thread_blocking_region(zkrb_gvl_zoo_acreate, (void *)&args);
+
+    return args.rc;
   }
 
 =end
@@ -156,43 +148,35 @@ class CallingFunction
     @fn_signature ||= "int #{name}(#{typed_args.join(', ')})"
   end
 
-  def ptr_lines
-    @ptr_lines = (
-      lines = ["ptr->rc = rc;"]
-      lines += member_names.map { |n| "ptr->#{n} = #{n};" }
-      lines.map! { |n| "  #{n}" }
-      lines.join("\n")
-    )
+  def initializer_lines
+    @initializer_lines ||= member_names.map { |n| "    .#{n} = #{n}" }.join(",\n")
   end
 
   def top
     <<-EOS
 // wrapper that calls #{zoo_fn_name} via #{wrapper_fn.name} inside rb_thread_blocking_region
 #{fn_signature} {
-  int rc = ZKRB_FAIL;
-  #{struct.name} *ptr = malloc(sizeof(#{struct.name}));
-  check_mem(ptr);
+  #{struct.name} args = {
+    .rc = ZKRB_FAIL,
+#{initializer_lines}
+  };
     EOS
   end
 
   def rb_thread_blocking_region_call
-    "  zkrb_thread_blocking_region(#{wrapper_fn.name}, (void *)ptr);"
+    "  zkrb_thread_blocking_region(#{wrapper_fn.name}, (void *)&args);"
   end
 
   def bottom
     <<-EOS
 
-  rc = ptr->rc;
-
-error:
-  free(ptr);
-  return rc;
+  return args.rc;
 }
     EOS
   end
 
   def body
-    @body ||= [top, ptr_lines, nil, rb_thread_blocking_region_call, bottom].join("\n")
+    @body ||= [top, rb_thread_blocking_region_call, bottom].join("\n")
   end
 end
 
@@ -209,6 +193,8 @@ class GeneratedCode < Struct.new(:structs, :wrapper_fns, :calling_fns)
     new.tap do |code|
       while true
         break unless text =~ REGEXP
+        text = $~.post_match
+
         zoo_fn_name, argstr = $1
         argstr = $2
 
@@ -228,8 +214,6 @@ class GeneratedCode < Struct.new(:structs, :wrapper_fns, :calling_fns)
         code.structs << struct
         code.wrapper_fns << wrapper_fn
         code.calling_fns << calling_fn
-
-        text = $~.post_match
       end
     end
   end