celluloid-pool 0.10.0.pre4 → 0.11.0.pre0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c55777df2d193b1653956397ba4526b28904008d
-  data.tar.gz: eae50db2ee716efc701bb49463579332487d13a0
+  metadata.gz: b8a5b5a00045d8f76b4aacfed6fd8329459431d1
+  data.tar.gz: 3ee6985ed4b292e291f77433ea6ec64d548e902e
 SHA512:
-  metadata.gz: d1a4e00cfae73050b102f77ad35b29cc2b50ff5df6b124ad62cb34399ae155c9b2278c10baf2ce65c4e7266d0d84a463ce822956c6afd5abe14b26e2b5780e4a
-  data.tar.gz: 76ffaea263828668fc2fab44f5ec7244f91a39181d51425da935b92c6ef202c991e1da781abf55dca8ca3ccad54ba8f1ba2a5da04a4d6b7d989d7326b37c71de
+  metadata.gz: e685ea4613ddf4a7b3f4aaa56489afec5fc7930188ca539347c60984fe810d7bf7a51aa61491ccce4a51f81b5f45c3b30ff38512e5c7de0502fc65864785131f
+  data.tar.gz: 28b9ba837503fcd60f28f4bfeb16f6c7019c0ad44c896b290a25a5055c5936d2865500d9c018c0358c2bde4da5263e3f3340c3b20f26ab22acdfd28e5923f943

data/.travis.yml

@@ -9,6 +9,7 @@ rvm:
   - rbx-2
 
 matrix:
+  fast_finish: true
   allow_failures:
     - rvm: rbx-2
     - rvm: ruby-head

data/Gemfile

@@ -1,24 +1,2 @@
 require File.expand_path("../culture/sync", __FILE__)
-source "https://rubygems.org"
-
-gemspec #de development_group: :gem_build_tools
-
-group :development do
-  gem "pry"
-  # de gem 'guard'
-  # de gem 'guard-rspec'
-  # de gem 'rb-fsevent', '~> 0.9.1' if RUBY_PLATFORM =~ /darwin/
-end
-
-group :test do
-  gem "dotenv", "~> 2.0"
-  gem "nenv"
-  gem "benchmark_suite"
-  gem "rspec", "~> 3.2"
-end
-
-group :gem_build_tools do
-  gem "rake"
-end
-
-Celluloid::Sync.gems(self)
+Celluloid::Sync::Gemfile[self]

data/celluloid-pool.gemspec

@@ -3,7 +3,7 @@ require File.expand_path("../culture/sync", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name          = "celluloid-pool"
-  gem.version       = "0.10.0.pre4"
+  gem.version       = "0.11.0.pre0"
   gem.authors       = ["Tony Arcieri", "Tim Carey-Smith", "digitalextremist //"]
   gem.email         = ["tony.arcieri@gmail.com", "code@extremist.digital"]
 
@@ -15,5 +15,5 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|examples|spec|features)/}) }
   gem.require_paths = ["lib"]
 
-  Celluloid::Sync.gems(gem)
+  Celluloid::Sync::Gemspec[gem]
 end

data/lib/celluloid/supervision/container/behavior/pool.rb

@@ -2,29 +2,32 @@ require "set"
 
 module Celluloid
   module ClassMethods
+    extend Forwardable
+    def_delegators :"Celluloid::Supervision::Container::Pool", :pooling_options
     # Create a new pool of workers. Accepts the following options:
     #
     # * size: how many workers to create. Default is worker per CPU core
     # * args: array of arguments to pass when creating a worker
     #
-    def pool(config={})
-      Celluloid.services.supervise(config.merge(type: Supervision::Container::Pool, args: [{workers: self}]))
-      Celluloid.services.actors.last
+    def pool(config={}, &block)
+      _ = Celluloid.supervise(pooling_options(config, block: block, actors: self))
+      _.actors.last
     end
 
     # Same as pool, but links to the pool manager
-    def pool_link(klass, config={})
-      Supervision::Container::Pool.new_link(
-        config.merge(args: [{workers: klass}]),
-      )
+    def pool_link(klass, config={}, &block)
+      Supervision::Container::Pool.new_link(pooling_options(config, block: block, actors: klass))
     end
   end
 
   module Supervision
     class Container
-      def pool(klass, config={})
-        Celluloid.services.supervise(config.merge(type: Container::Pool, args: [{workers: klass}]))
-        Celluloid.services.actors.last
+      extend Forwardable
+      def_delegators :"Celluloid::Supervision::Container::Pool", :pooling_options
+
+      def pool(klass, config={}, &block)
+        _ = supervise(pooling_options(config, block: block, actors: klass))
+        _.actors.last
       end
 
       class Instance
@@ -33,9 +36,9 @@ module Celluloid
 
       class << self
         # Register a pool of actors to be launched on group startup
-        def pool(klass, *args, &_block)
+        def pool(klass, config, &block)
           blocks << lambda do |container|
-            container.pool(klass, Configuration.options(args))
+            container.pool(klass, config, &block)
           end
         end
       end
@@ -43,10 +46,17 @@ module Celluloid
       class Pool
         include Behavior
 
+        class << self
+          def pooling_options(config={},mixins={})
+            combined = { :type => Celluloid::Supervision::Container::Pool }.merge(config).merge(mixins)
+            combined[:args] = [[:block, :actors, :size, :args].inject({}) { |e,p| e[p] = combined.delete(p) if combined[p]; e }]
+            combined
+          end
+        end
+
         identifier! :size, :pool
 
         configuration do
-          puts "configuring pool"
           @supervisor = Container::Pool
           @method = "pool_link"
           @pool = true

data/lib/celluloid/supervision/container/pool.rb

@@ -1,36 +1,34 @@
 module Celluloid
   module Supervision
     class Container
-      # Manages a fixed-size pool of workers
-      # Delegates work (i.e. methods) and supervises workers
+      # Manages a fixed-size pool of actors
+      # Delegates work (i.e. methods) and supervises actors
       # Don't use this class directly. Instead use MyKlass.pool
       class Pool
-
         include Celluloid
 
         trap_exit :__crash_handler__
         finalizer :__shutdown__
 
+        attr_reader :size, :actors
+
         def initialize(options={})
           @idle = []
           @busy = []
-          @workers = options[:workers]
-          @args = {}
-          @size = 0
+          @klass = options[:actors]
+          @actors = Set.new
+          @mutex = Mutex.new
 
-          #de options = Supervision::Configuration.options(options)
           @size = options[:size] || [Celluloid.cores || 2, 2].max
           @args = options[:args] ? Array(options[:args]) : []
 
-          fail ArgumentError, "minimum pool size is 2" if @size < 2
-
           # Do this last since it can suspend and/or crash
-          @idle = @size.times.map { @workers.new_link(*@args) }
+          @idle = @size.times.map { __spawn_actor__ }
         end
 
         def __shutdown__
           # TODO: these can be nil if initializer crashes
-          terminators = (@idle + @busy).map do |actor|
+          terminators = @actors.map do |actor|
             begin
               actor.future(:terminate)
             rescue DeadActorError
@@ -41,24 +39,23 @@ module Celluloid
         end
 
         def _send_(method, *args, &block)
-          worker = __provision_worker__
-
+          actor = __provision_actor__
           begin
-            worker._send_ method, *args, &block
+            actor._send_ method, *args, &block
           rescue DeadActorError # if we get a dead actor out of the pool
             wait :respawn_complete
-            worker = __provision_worker__
+            actor = __provision_actor__
             retry
           rescue Exception => ex
             abort ex
           ensure
-            if worker.alive?
-              @idle << worker
-              @busy.delete worker
+            if actor.alive?
+              @idle << actor
+              @busy.delete actor
 
-              # Broadcast that worker is done processing and
+              # Broadcast that actor is done processing and
               # waiting idle
-              signal :worker_idle
+              signal :actor_idle
             end
           end
         end
@@ -87,20 +84,18 @@ module Celluloid
           _send_ :inspect
         end
 
-        attr_reader :size
-
         def size=(new_size)
           new_size = [0, new_size].max
-
           if new_size > size
             delta = new_size - size
-            delta.times { @idle << @workers.new_link(*@args) }
+            delta.times { @idle << __spawn_actor__ }
           else
             (size - new_size).times do
-              worker = __provision_worker__
-              unlink worker
-              @busy.delete worker
-              worker.terminate
+              actor = __provision_actor__
+              unlink actor
+              @busy.delete actor
+              @actors.delete actor
+              actor.terminate
             end
           end
           @size = new_size
@@ -114,28 +109,65 @@ module Celluloid
           @idle.length
         end
 
-        # Provision a new worker
-        def __provision_worker__
+        def __idle?(actor)
+          @idle.include? actor
+        end
+
+        def __busy?(actor)
+          @busy.include? actor
+        end
+
+        def __busy
+          @busy
+        end
+        
+        def __idle
+          @idle
+        end
+
+        def __idling?
+          @mutex.synchronize { @idle.empty? }
+        end
+
+        def __state(actor)
+          return :busy if __busy?(actor)
+          return :idle if __idle?(actor)
+          :missing
+        end
+
+        # Instantiate an actor, add it to the actor Set, and return it
+        def __spawn_actor__
+          actor = @klass.new_link(*@args)
+          @mutex.synchronize { @actors.add(actor) }
+          actor
+        end
+
+        # Provision a new actor ( take it out of idle, move it into busy, and avail it )
+        def __provision_actor__
           Task.current.guard_warnings = true
-          while @idle.empty?
-            # Wait for responses from one of the busy workers
+          while __idling?
+            # Wait for responses from one of the busy actors
             response = exclusive { receive { |msg| msg.is_a?(Internals::Response) } }
             Thread.current[:celluloid_actor].handle_message(response)
           end
 
-          worker = @idle.shift
-          @busy << worker
-
-          worker
+          @mutex.synchronize {
+            actor = @idle.shift
+            @busy << actor
+            actor
+          }
         end
 
         # Spawn a new worker for every crashed one
         def __crash_handler__(actor, reason)
-          @busy.delete actor
-          @idle.delete actor
+          @mutex.synchronize {
+            @busy.delete actor
+            @idle.delete actor
+            @actors.delete actor
+          }
           return unless reason
 
-          @idle << @workers.new_link(*@args)
+          @idle << __spawn_actor__
           signal :respawn_complete
         end
 
@@ -175,7 +207,7 @@ module Celluloid
         def method(meth)
           super
         rescue NameError
-          @workers.instance_method(meth.to_sym)
+          @klass.instance_method(meth.to_sym)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-pool
 version: !ruby/object:Gem::Version
-  version: 0.10.0.pre4
+  version: 0.11.0.pre0
 platform: ruby
 authors:
 - Tony Arcieri
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: rubocop
+  name: nenv
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
@@ -46,7 +46,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: coveralls
+  name: dotenv
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
@@ -54,6 +54,90 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: benchmark_suite
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rubocop
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: pry
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rake
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rspec
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: coveralls
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: