celluloid 0.16.0.pre → 0.16.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f9e4bf5d8e26e99c5321bc02c61cafa9de48600
-  data.tar.gz: b239f25215d8c3ca0c9c27cd3e08954fa62ee35c
+  metadata.gz: c9c58eede0a8ebeb315bf6f2fa925e19173dd5e9
+  data.tar.gz: 525f0ae4823a55ca1e23bf1ff5b6c8493592551f
 SHA512:
-  metadata.gz: be0d373d83500400c1135176382097f8bdffeb378fbce48f95852195975984a626221292ade6182ba84cc5a9ca06fa0849461d28c68e9adea33c129396ab39a3
-  data.tar.gz: 6f6cd39aec05a5b8f4b461ad88cd6c960a37d5832ca36ee5f633bf0e3229b294fb714668dcf87d843e162749507c301d14d32d2ae2d344c726b3f55346f9e6c8
+  metadata.gz: 2ac75588d4accd17305ea04b6329563783db6972262584898e3143bdf6086ba47dc8bcf8c93ad6c7a8b44115c2c718fbcc615219da968ffdfa8a7a5f17b5f908
+  data.tar.gz: e1185014388060dcd75a41b583a6df01f7bcbb37e21e1619091e364374cb861a31df7c7110b371887540c2482ff54cfae0cf7a3df534fc188157e220d5f8cd12

data/README.md

@@ -170,7 +170,3 @@ License
 
 Copyright (c) 2011-2014 Tony Arcieri. Distributed under the MIT License. See
 LICENSE.txt for further details.
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/celluloid/celluloid/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

data/lib/celluloid.rb

@@ -7,7 +7,7 @@ module Celluloid
   # Expose all instance methods as singleton methods
   extend self
 
-  VERSION = '0.16.0.pre'
+  VERSION = '0.16.0.pre2'
 
   # Linking times out after 5 seconds
   LINKING_TIMEOUT = 5

data/lib/celluloid/actor.rb

@@ -1,3 +1,4 @@
+
 require 'timers'
 
 module Celluloid
@@ -112,7 +113,7 @@ module Celluloid
       @links     = Links.new
       @signals   = Signals.new
       @receivers = Receivers.new
-      @timers    = Timers.new
+      @timers    = Timers::Group.new
       @handlers  = Handlers.new
       @running   = false
       @name      = nil
@@ -170,31 +171,37 @@ module Celluloid
     # Perform a linking request with another actor
     def linking_request(receiver, type)
       Celluloid.exclusive do
-        start_time = Time.now
+        linking_timeout = Timers::Timeout.new(LINKING_TIMEOUT)
+
         receiver.mailbox << LinkingRequest.new(Actor.current, type)
         system_events = []
 
-        loop do
-          wait_interval = start_time + LINKING_TIMEOUT - Time.now
-          message = @mailbox.receive(wait_interval) do |msg|
-            msg.is_a?(LinkingResponse) &&
-            msg.actor.mailbox.address == receiver.mailbox.address &&
-            msg.type == type
+        linking_timeout.while_time_remaining do |remaining|
+          begin
+            message = @mailbox.receive(remaining) do |msg|
+              msg.is_a?(LinkingResponse) &&
+              msg.actor.mailbox.address == receiver.mailbox.address &&
+              msg.type == type
+            end
+          rescue TimeoutError
+            next # IO reactor did something, no message in queue yet.
           end
 
           if message.instance_of? LinkingResponse
             Celluloid::Probe.actors_linked(self, receiver) if $CELLULOID_MONITORING
+
             # We're done!
             system_events.each { |ev| @mailbox << ev }
+
             return
-          elsif message.instance_of? NilClass
-            raise TimeoutError, "linking timeout of #{LINKING_TIMEOUT} seconds exceeded"
-          elsif message.instance_of? SystemEvent
+          elsif message.is_a? SystemEvent
             # Queue up pending system events to be processed after we've successfully linked
             system_events << message
-          else raise 'wtf'
+          else raise "Unexpected message type: #{message.class}. Expected LinkingResponse, NilClass, SystemEvent."
           end
         end
+
+        raise TimeoutError, "linking timeout of #{LINKING_TIMEOUT} seconds exceeded"
       end
     end
 

data/lib/celluloid/call_chain.rb

@@ -10,4 +10,4 @@ module Celluloid
       Thread.current[:celluloid_chain_id]
     end
   end
- end
+end

data/lib/celluloid/cpu_counter.rb

@@ -1,26 +1,33 @@
-require 'rbconfig'
-
 module Celluloid
   module CPUCounter
-    case RbConfig::CONFIG['host_os'][/^[A-Za-z]+/]
-    when 'darwin'
-      @cores = Integer(`/usr/sbin/sysctl hw.ncpu`[/\d+/])
-    when 'linux'
-      @cores = if File.exists?("/sys/devices/system/cpu/present")
-        File.read("/sys/devices/system/cpu/present").split('-').last.to_i+1
-      else
-        Dir["/sys/devices/system/cpu/cpu*"].select { |n| n=~/cpu\d+/ }.count
+    class << self
+      def cores
+        @cores ||= count_cores
       end
-    when 'mingw', 'mswin'
-      @cores = Integer(ENV["NUMBER_OF_PROCESSORS"][/\d+/])
-    when 'freebsd'
-      @cores = Integer(`sysctl hw.ncpu`[/\d+/])
-    else
-      @cores = nil
-    end
 
-    def self.cores; @cores; end
-  end
-end
+      private
 
+      def count_cores
+        result = from_env || from_sysdev || from_sysctl
+        Integer(result.to_s[/\d+/], 10) if result
+      end
+
+      def from_env
+        result = ENV['NUMBER_OF_PROCESSORS']
+        result if result
+      end
 
+      def from_sysdev
+        ::IO.read('/sys/devices/system/cpu/present').split('-').last.to_i + 1
+      rescue Errno::ENOENT
+        result = Dir['/sys/devices/system/cpu/cpu*'].count { |n| n =~ /cpu\d+/ }
+        result unless result.zero?
+      end
+
+      def from_sysctl
+        result = `sysctl -n hw.ncpu`
+        result if $?.success?
+      end
+    end
+  end
+end

data/lib/celluloid/evented_mailbox.rb

@@ -38,24 +38,16 @@ module Celluloid
 
     # Receive a message from the Mailbox
     def receive(timeout = nil, &block)
-      message = next_message(block)
-
-      until message
-        if timeout
-          # TODO: use hitimes/timers instead of Time.now
-          now = Time.now
-          wait_until ||= now + timeout
-          wait_interval = wait_until - now
-          raise(TimeoutError, "mailbox timeout exceeded", nil) if wait_interval <= 0
-        else
-          wait_interval = nil
-        end
-
-        @reactor.run_once(wait_interval)
-        message = next_message(block)
+      # Get a message if it is available and process it immediately if possible:
+      if message = next_message(block)
+        return message
       end
 
-      message
+      # ... otherwise, run the reactor once, either blocking or will return after the given timeout.
+      @reactor.run_once(timeout)
+
+      # This is a hack to get the main Actor#run loop to recompute the timeout:
+      raise TimeoutError
     rescue IOError
       raise MailboxShutdown, "mailbox shutdown called during receive"
     end

data/lib/celluloid/pool_manager.rb

@@ -24,7 +24,7 @@ module Celluloid
     end
 
     def __shutdown__
-      terminators = (@idle + @busy).each do |actor|
+      terminators = (@idle + @busy).map do |actor|
         begin
           actor.future(:terminate)
         rescue DeadActorError
@@ -81,6 +81,23 @@ module Celluloid
       @size
     end
 
+    def size=(new_size)
+      new_size = [0, new_size].max
+
+      if new_size > size
+        delta = new_size - size
+        delta.times { @idle << @worker_class.new_link(*@args) }
+      else
+        (size - new_size).times do
+          worker = __provision_worker__
+          unlink worker
+          @busy.delete worker
+          worker.terminate
+        end
+      end
+      @size = new_size
+    end
+
     def busy_size
       @busy.length
     end

data/lib/celluloid/receivers.rb

@@ -1,4 +1,5 @@
 require 'set'
+
 require 'timers'
 
 module Celluloid
@@ -6,7 +7,7 @@ module Celluloid
   class Receivers
     def initialize
       @receivers = Set.new
-      @timers = Timers.new
+      @timers = Timers::Group.new
     end
 
     # Receive an asynchronous message

data/lib/celluloid/tasks/task_fiber.rb

@@ -37,7 +37,7 @@ module Celluloid
     end
 
     def backtrace
-      "#{self.class} backtrace unavailable. Please try `Celluloid.task_class = Celluloid::TaskThread` if you need backtraces here."
+      ["#{self.class} backtrace unavailable. Please try `Celluloid.task_class = Celluloid::TaskThread` if you need backtraces here."]
     end
   end
 end

data/spec/celluloid/cpu_counter_spec.rb

@@ -2,8 +2,81 @@ require 'spec_helper'
 
 describe Celluloid::CPUCounter do
   describe :cores do
-    it 'should return an integer' do
-      Celluloid::CPUCounter.cores.should be_kind_of(Fixnum)
+    subject { described_class.cores }
+
+    let(:num_cores) { 1024 }
+
+    before do
+      described_class.stub(:`) { fail 'backtick stub called' }
+      ::IO.stub(:open).and_raise('IO.open stub called!')
+      described_class.instance_variable_set('@cores', nil)
+    end
+
+    after { ENV['NUMBER_OF_PROCESSORS'] = nil }
+
+    context 'from valid env value' do
+      before { ENV['NUMBER_OF_PROCESSORS'] = num_cores.to_s }
+      it { should eq num_cores }
+    end
+
+    context 'from invalid env value' do
+      before { ENV['NUMBER_OF_PROCESSORS'] = '' }
+      specify { expect { subject }.to raise_error(ArgumentError) }
+    end
+
+    context 'with no env value' do
+      before { ENV['NUMBER_OF_PROCESSORS'] = nil }
+
+      context 'when /sys/devices/system/cpu/present exists' do
+        before do
+          ::IO.should_receive(:read).with('/sys/devices/system/cpu/present')
+            .and_return("dunno-whatever-#{num_cores - 1}")
+        end
+        it { should eq num_cores }
+      end
+
+      context 'when /sys/devices/system/cpu/present does NOT exist' do
+        before do
+          ::IO.should_receive(:read).with('/sys/devices/system/cpu/present')
+            .and_raise(Errno::ENOENT)
+        end
+
+        context 'when /sys/devices/system/cpu/cpu* files exist' do
+          before do
+            cpu_entries = (1..num_cores).map { |n| "cpu#{n}" }
+            cpu_entries << 'non-cpu-entry-to-ignore'
+            Dir.should_receive(:[]).with('/sys/devices/system/cpu/cpu*')
+              .and_return(cpu_entries)
+          end
+          it { should eq num_cores }
+        end
+
+        context 'when /sys/devices/system/cpu/cpu* files DO NOT exist' do
+          before do
+            Dir.should_receive(:[]).with('/sys/devices/system/cpu/cpu*')
+              .and_return([])
+          end
+
+          context 'when sysctl blows up' do
+            before { described_class.stub(:`).and_raise(Errno::EINTR) }
+            specify { expect { subject }.to raise_error }
+          end
+
+          context 'when sysctl fails' do
+            before { described_class.stub(:`).and_return(`false`) }
+            it { should be nil }
+          end
+
+          context 'when sysctl succeeds' do
+            before do
+              described_class.should_receive(:`).with('sysctl -n hw.ncpu')
+                .and_return(num_cores.to_s)
+              `true`
+            end
+            it { should eq num_cores }
+          end
+        end
+      end
     end
   end
 end

data/spec/celluloid/pool_spec.rb

@@ -14,11 +14,23 @@ describe "Celluloid.pool", actor_system: :global do
       end
     end
 
+    def sleepy_work
+      t = Time.now.to_f
+      sleep 0.25
+      t
+    end
+
     def crash
       raise ExampleError, "zomgcrash"
     end
   end
 
+  def test_concurrency_of(pool)
+    baseline = Time.now.to_f
+    values = 10.times.map { pool.future.sleepy_work }.map(&:value)
+    values.select {|t| t - baseline < 0.1 }.length
+  end
+
   subject { MyWorker.pool }
 
   it "processes work units synchronously" do
@@ -56,4 +68,25 @@ describe "Celluloid.pool", actor_system: :global do
     end
     futures.map(&:value)
   end
+
+  context "#size=" do
+    subject { MyWorker.pool size: 4 }
+
+    it "should adjust the pool size up", pending: 'flaky' do
+      expect(test_concurrency_of(subject)).to eq(4)
+
+      subject.size = 6
+      subject.size.should == 6
+
+      test_concurrency_of(subject).should == 6
+    end
+
+    it "should adjust the pool size down" do
+      test_concurrency_of(subject).should == 4
+
+      subject.size = 2
+      subject.size.should == 2
+      test_concurrency_of(subject).should == 2
+    end
+  end
 end

data/spec/celluloid/stack_dump_spec.rb

@@ -45,8 +45,8 @@ describe Celluloid::StackDump do
   end
 
   describe '#threads' do
-    it 'should include threads that are not actors' do
-      subject.threads.size.should == 3
+    it 'should include threads that are not actors', pending: 'flaky' do
+      expect(subject.threads.size).to eq(3)
     end
 
     it 'should include idle threads' do
@@ -57,8 +57,8 @@ describe Celluloid::StackDump do
       subject.threads.map(&:thread_id).should include(@active_thread.object_id)
     end
 
-    it 'should have the correct roles' do
-      subject.threads.map(&:role).should include(nil, :other_thing, :task)
+    it 'should have the correct roles', pending: 'flaky' do
+      expect(subject.threads.map(&:role)).to include(nil, :other_thing, :task)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: celluloid
 version: !ruby/object:Gem::Version
-  version: 0.16.0.pre
+  version: 0.16.0.pre2
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Celluloid enables people to build concurrent programs out of concurrent
   objects just as easily as they build sequential programs out of sequential objects
 email:
@@ -196,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Actor-based concurrent object framework for Ruby