zk-eventmachine 0.2.0.beta.1 → 0.2.0.beta.2

data/.dev_extras/rvmrc

@@ -1 +1 @@
-rvm 1.9.2@zk-em
+rvm 1.9.2@zk-em --create

data/lib/z_k/z_k_event_machine/client.rb

@@ -29,6 +29,9 @@ module ZK
       def connect(&blk)
         # XXX: maybe move this into initialize, need to figure out how to schedule it properly
         @cnx ||= ZookeeperEM::Client.new(@host, DEFAULT_TIMEOUT, event_handler.get_default_watcher_block)
+#         @cnx.on_attached do
+#           $stderr.puts "@cnx, obj_id: %x" % [@cnx.object_id]
+#         end
         @cnx.on_attached(&blk)
       end
 
@@ -63,8 +66,11 @@ module ZK
 
           logger.debug { "#{self.class.name}: calling @cnx.close" }
           @cnx.close do
-            logger.debug { "firing on_close handler" }
-            on_close.succeed
+            # fire the on_close handler in next_tick so that @cnx is nil
+            EM.next_tick do
+              logger.debug { "firing on_close handler" }
+              on_close.succeed
+            end
             @cnx = nil
           end
         else
@@ -144,6 +150,16 @@ module ZK
         end
       end
 
+      # returns an EM::Synchrony compatible wrapper around this client
+      def to_synchrony
+        @synchrony_client ||= SynchronyClient.new(self)
+      end
+
+      # returns self
+      def to_async
+        self
+      end
+
     protected
       def connection_lost_hook(exc)
         if exc and exc.kind_of?(ZK::Exceptions::ConnectionLoss)

data/lib/z_k/z_k_event_machine/synchrony_client.rb

@@ -58,7 +58,7 @@ module ZK
         @event_handler = SynchronyEventHandlerWrapper.new(@client.event_handler)
       end
 
-      %w[connect close close! get set create stat delete children get_acl set_acl mkdir_p rm_rf].each do |meth|
+      %w[connect get set create stat delete children get_acl set_acl mkdir_p rm_rf].each do |meth|
         class_eval(<<-EOMETH, __FILE__, __LINE__ + 1)
           def #{meth}(*args,&blk)
             sync!(@client.#{meth}(*args, &blk))
@@ -66,6 +66,18 @@ module ZK
         EOMETH
       end
 
+      # it is *crucially* important that close and close! be wrapped in a fiber.
+      # it's possible under very odd corner cases with the 1.9.3 GC to cause a
+      # '[BUG] cfp consistency error - send'
+      #
+      %w[close close!].each do |meth|
+        class_eval(<<-EOMETH, __FILE__, __LINE__ + 1)
+          def #{meth}(*args,&blk)
+            Fiber.new { sync!(@client.#{meth}(*args, &blk)) }.resume
+          end
+        EOMETH
+      end
+
       # @deprecated for backwards compatibility only
       def watcher
         event_handler
@@ -75,6 +87,16 @@ module ZK
         stat(path, opts={}).exists?
       end
 
+      # returns self
+      def to_synchrony
+        self
+      end
+
+      # returns the wrapped async client
+      def to_async
+        @client
+      end
+
       protected
         # a modification of EM::Synchrony.sync to handle multiple callback arguments properly
         def sync(df)

data/lib/z_k/z_k_event_machine/unixisms.rb

@@ -3,7 +3,7 @@ module ZK
     module Unixisms
       def mkdir_p(paths, &block)
         dfr = Deferred::Default.new.tap do |my_dfr|
-          Iterator.new(Array(paths).flatten.compact, 1).map(
+          EM::Iterator.new(Array(paths).flatten.compact, 1).map(
             lambda { |path,iter|          # foreach
               d = _mkdir_p_dfr(path)
               d.callback { |p| iter.return(p) }
@@ -18,7 +18,7 @@ module ZK
 
       def rm_rf(paths, &blk)
         dfr = Deferred::Default.new.tap do |my_dfr|
-          Iterator.new(Array(paths).flatten.compact, 1).each(
+          EM::Iterator.new(Array(paths).flatten.compact, 1).each(
             lambda { |path,iter|          # foreach
               d = _rm_rf_dfr(path)
               d.callback { iter.next }
@@ -60,7 +60,7 @@ module ZK
                     my_dfr.succeed
                   when nil
                     abspaths = chldrn.map { |n| [path, n].join('/') }
-                    Iterator.new(abspaths).each(
+                    EM::Iterator.new(abspaths).each(
                       lambda { |absp,iter|  
                         d = _rm_rf_dfr(absp)
                         d.callback  { |*| 

data/lib/z_k/z_k_event_machine/version.rb

@@ -1,5 +1,5 @@
 module ZK
   module ZKEventMachine
-    VERSION = "0.2.0.beta.1"
+    VERSION = "0.2.0.beta.2"
   end
 end

data/lib/z_k/z_k_event_machine.rb

@@ -6,7 +6,6 @@ require 'zookeeper/em_client'
 
 require 'zk'
 
-
 module ZK
   module ZKEventMachine
   end
@@ -15,7 +14,6 @@ end
 
 $LOAD_PATH.unshift(File.expand_path('../..', __FILE__)).uniq!
 
-require 'z_k/z_k_event_machine/iterator'
 require 'z_k/z_k_event_machine/deferred'
 require 'z_k/z_k_event_machine/callback'
 require 'z_k/z_k_event_machine/event_handler_e_m'

data/spec/z_k/z_k_event_machine/synchrony_client_spec.rb

@@ -29,7 +29,8 @@ module ZK
         @base_path = '/zk-em-testing'
         @zk.rm_rf(@base_path)
         @zk.mkdir_p(@base_path)
-        @zksync = ZK::ZKEventMachine::SynchronyClient.new('localhost:2181')
+#         $stderr.puts "zk obj_id: %x" % [@zk.object_id]
+        @zksync = ZK::ZKEventMachine::SynchronyClient.new('localhost:2181', :zkc_log_level => 4)
       end
 
       after do
@@ -324,6 +325,8 @@ module ZK
             @zksync.event_handler.register(@new_path) do |event|
               logger.debug { "got event #{event}" }
 
+              # without close! wrapping itself in Fiber.new, this causes a
+              # '[BUG] cfp consistency error - send' under 1.9.3 
               done { @zksync.close! }
             end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zk-eventmachine
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta.1
+  version: 0.2.0.beta.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-01 00:00:00.000000000Z
+date: 2011-11-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zk
-  requirement: &2169005720 !ruby/object:Gem::Requirement
+  requirement: &2156053200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.5
   type: :runtime
   prerelease: false
-  version_requirements: *2169005720
+  version_requirements: *2156053200
 - !ruby/object:Gem::Dependency
   name: slyphon-zookeeper
-  requirement: &2169005220 !ruby/object:Gem::Requirement
+  requirement: &2156052080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *2169005220
+  version_requirements: *2156052080
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2169004760 !ruby/object:Gem::Requirement
+  requirement: &2156051200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0.beta.3
   type: :runtime
   prerelease: false
-  version_requirements: *2169004760
+  version_requirements: *2156051200
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &2169004260 !ruby/object:Gem::Requirement
+  requirement: &2156050280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2169004260
+  version_requirements: *2156050280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2169003800 !ruby/object:Gem::Requirement
+  requirement: &2156049400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2169003800
+  version_requirements: *2156049400
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2169003260 !ruby/object:Gem::Requirement
+  requirement: &2156048620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *2169003260
+  version_requirements: *2156048620
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2169002720 !ruby/object:Gem::Requirement
+  requirement: &2156047400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 4.4.0
   type: :development
   prerelease: false
-  version_requirements: *2169002720
+  version_requirements: *2156047400
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &2169002220 !ruby/object:Gem::Requirement
+  requirement: &2156046380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.8.10
   type: :development
   prerelease: false
-  version_requirements: *2169002220
+  version_requirements: *2156046380
 - !ruby/object:Gem::Dependency
   name: evented-spec
-  requirement: &2169001680 !ruby/object:Gem::Requirement
+  requirement: &2156045160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: *2169001680
+  version_requirements: *2156045160
 description: ''
 email:
 - slyphon@hp.com
@@ -131,7 +131,6 @@ files:
 - lib/z_k/z_k_event_machine/client.rb
 - lib/z_k/z_k_event_machine/deferred.rb
 - lib/z_k/z_k_event_machine/event_handler_e_m.rb
-- lib/z_k/z_k_event_machine/iterator.rb
 - lib/z_k/z_k_event_machine/synchrony_client.rb
 - lib/z_k/z_k_event_machine/unixisms.rb
 - lib/z_k/z_k_event_machine/version.rb

data/lib/z_k/z_k_event_machine/iterator.rb

@@ -1,229 +0,0 @@
-# Taken from EventMachine release candidate
-module ZK
-  module ZKEventMachine
-    # A simple iterator for concurrent asynchronous work.
-    #
-    # Unlike ruby's built-in iterators, the end of the current iteration cycle is signaled manually,
-    # instead of happening automatically after the yielded block finishes executing. For example:
-    #
-    #  (0..10).each{ |num| }
-    #
-    # becomes:
-    #
-    #  EM::Iterator.new(0..10).each{ |num,iter| iter.next }
-    #
-    # This is especially useful when doing asynchronous work via reactor libraries and
-    # functions. For example, given a sync and async http api:
-    #
-    #  response = sync_http_get(url); ...
-    #  async_http_get(url){ |response| ... }
-    #
-    # a synchronous iterator such as:
-    #
-    #  responses = urls.map{ |url| sync_http_get(url) }
-    #  ...
-    #  puts 'all done!'
-    #
-    # could be written as:
-    #
-    #  EM::Iterator.new(urls).map(proc{ |url,iter|
-    #    async_http_get(url){ |res|
-    #      iter.return(res)
-    #    }
-    #  }, proc{ |responses|
-    #    ...
-    #    puts 'all done!'
-    #  })
-    #
-    # Now, you can take advantage of the asynchronous api to issue requests in parallel. For example,
-    # to fetch 10 urls at a time, simply pass in a concurrency of 10:
-    #
-    #  EM::Iterator.new(urls, 10).each do |url,iter|
-    #    async_http_get(url){ iter.next }
-    #  end
-    #
-    class Iterator
-      # Create a new parallel async iterator with specified concurrency.
-      #
-      #  i = EM::Iterator.new(1..100, 10)
-      #
-      # will create an iterator over the range that processes 10 items at a time. Iteration
-      # is started via #each, #map or #inject
-      #
-      def initialize(list, concurrency = 1)
-        raise ArgumentError, 'argument must be an array' unless list.respond_to?(:to_a)
-        @list = list.to_a.dup
-        @concurrency = concurrency
-
-        @started = false
-        @ended = false
-      end
-
-      # Change the concurrency of this iterator. Workers will automatically be spawned or destroyed
-      # to accomodate the new concurrency level.
-      #
-      def concurrency=(val)
-        old = @concurrency
-        @concurrency = val
-
-        spawn_workers if val > old and @started and !@ended
-      end
-      attr_reader :concurrency
-
-      # Iterate over a set of items using the specified block or proc.
-      #
-      #  EM::Iterator.new(1..100).each do |num, iter|
-      #    puts num
-      #    iter.next
-      #  end
-      #
-      # An optional second proc is invoked after the iteration is complete.
-      #
-      #  EM::Iterator.new(1..100).each(
-      #    proc{ |num,iter| iter.next },
-      #    proc{ puts 'all done' }
-      #  )
-      #
-      def each(foreach=nil, after=nil, &blk)
-        raise ArgumentError, 'proc or block required for iteration' unless foreach ||= blk
-        raise RuntimeError, 'cannot iterate over an iterator more than once' if @started or @ended
-
-        @started = true
-        @pending = 0
-        @workers = 0
-
-        all_done = proc{
-          after.call if after and @ended and @pending == 0
-        }
-
-        @process_next = proc{
-          # p [:process_next, :pending=, @pending, :workers=, @workers, :ended=, @ended, :concurrency=, @concurrency, :list=, @list]
-          unless @ended or @workers > @concurrency
-            if @list.empty?
-              @ended = true
-              @workers -= 1
-              all_done.call
-            else
-              item = @list.shift
-              @pending += 1
-
-              is_done = false
-              on_done = proc{
-                raise RuntimeError, 'already completed this iteration' if is_done
-                is_done = true
-
-                @pending -= 1
-
-                if @ended
-                  all_done.call
-                else
-                  EM.next_tick(@process_next)
-                end
-              }
-              class << on_done
-                alias :next :call
-              end
-
-              foreach.call(item, on_done)
-            end
-          else
-            @workers -= 1
-          end
-        }
-
-        spawn_workers
-
-        self
-      end
-
-      # Collect the results of an asynchronous iteration into an array.
-      #
-      #  EM::Iterator.new(%w[ pwd uptime uname date ], 2).map(proc{ |cmd,iter|
-      #    EM.system(cmd){ |output,status|
-      #      iter.return(output)
-      #    }
-      #  }, proc{ |results|
-      #    p results
-      #  })
-      #
-      def map(foreach, after)
-        index = 0
-
-        inject([], proc{ |results,item,iter|
-          i = index
-          index += 1
-
-          is_done = false
-          on_done = proc{ |res|
-            raise RuntimeError, 'already returned a value for this iteration' if is_done
-            is_done = true
-
-            results[i] = res
-            iter.return(results)
-          }
-          class << on_done
-            alias :return :call
-            def next
-              raise NoMethodError, 'must call #return on a map iterator'
-            end
-          end
-
-          foreach.call(item, on_done)
-        }, proc{ |results|
-          after.call(results)
-        })
-      end
-
-      # Inject the results of an asynchronous iteration onto a given object.
-      #
-      #  EM::Iterator.new(%w[ pwd uptime uname date ], 2).inject({}, proc{ |hash,cmd,iter|
-      #    EM.system(cmd){ |output,status|
-      #      hash[cmd] = status.exitstatus == 0 ? output.strip : nil
-      #      iter.return(hash)
-      #    }
-      #  }, proc{ |results|
-      #    p results
-      #  })
-      #
-      def inject(obj, foreach, after)
-        each(proc{ |item,iter|
-          is_done = false
-          on_done = proc{ |res|
-            raise RuntimeError, 'already returned a value for this iteration' if is_done
-            is_done = true
-
-            obj = res
-            iter.next
-          }
-          class << on_done
-            alias :return :call
-            def next
-              raise NoMethodError, 'must call #return on an inject iterator'
-            end
-          end
-
-          foreach.call(obj, item, on_done)
-        }, proc{
-          after.call(obj)
-        })
-      end
-
-      private
-
-      # Spawn workers to consume items from the iterator's enumerator based on the current concurrency level.
-      #
-      def spawn_workers
-        EM.next_tick(start_worker = proc{
-          if @workers < @concurrency and !@ended
-            # p [:spawning_worker, :workers=, @workers, :concurrency=, @concurrency, :ended=, @ended]
-            @workers += 1
-            @process_next.call
-            EM.next_tick(start_worker)
-          end
-        })
-        nil
-      end
-    end
-  end
-end
-