concurrent-ruby 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 755d47349aa9471448745d4d102eef30c9ff39f9
-  data.tar.gz: 3ed64a6aa698387b8043cceb72bb64c3b45d4f2f
+  metadata.gz: 2a2299d64fb78b008f9f686ac6f72b87e92f54b5
+  data.tar.gz: b76068bdde155ed1e3f0572dca60b34cb9e7f952
 SHA512:
-  metadata.gz: ba402eee86f4836735c7f659ac45c0c8df22863d718435179348a4fa5707a1671629d113c615ea4f87a0ac60019999556c1ae84b468c8abca3907e7e7efb6ea1
-  data.tar.gz: a689c273e9173afffa0945b4621b88bd9276cf478c4aaf9692bddb78ed610521c9a22fb449ca229feb869654018f37df670f19eb172e027ba4a631f5482692ec
+  metadata.gz: cc3346484a3fce841b6e10ee5406bb938a8d16f48295b08fd71014187cf7adb24c398b6856aef6ad62ef74e6d13d5a4a5adc9b1a57102b5175eaf269256850fd
+  data.tar.gz: 8c30bbcfde894063c3c466dd7a66b13c30827674d13446dc0a9f95b46509c326913ca927303047bf7537971a49905c0286cd90a4e45788e89504277034ea5834

data/README.md

@@ -41,9 +41,7 @@ The design goals of this gem are:
 ### Supported Ruby versions
 
 MRI 1.9.2, 1.9.3, 2.0, 2.1, and JRuby (1.9 mode). This library is pure Ruby and has no gem dependencies.
-It should be fully compatible with any Ruby interpreter that is 1.9.x compliant. I simply don't know enough
-about Rubinius or the others to fully support them. I can promise good karma and attribution on this page
-to anyone wishing to take responsibility for verifying compaitibility with any Ruby other than MRI.
+It should be fully compatible with any Ruby interpreter that is 1.9.x compliant.
 
 ### Example
 
@@ -105,6 +103,21 @@ These tools will help ease the burden, but at the end of the day it is essential
 * Don't mix Ruby's [concurrency](http://ruby-doc.org/core-2.0.0/Thread.html)
   [primitives](http://www.ruby-doc.org/core-2.0.0/Mutex.html) with asynchronous concurrency libraries
 
+## Contributors
+
+* [Michele Della Torre](https://github.com/mighe)
+* [Chip Miller](https://github.com/chip-miller)
+* [Jamie Hodge](https://github.com/jamiehodge)
+* [Zander Hill](https://github.com/zph)
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
 ### Conference Presentations
 
 I've given several conference presentations on concurrent programming with this gem.
@@ -123,39 +136,7 @@ Check them out:
 * I'll be giving ["Advanced Concurrent Programming in Ruby"](http://codemash.org/sessions)
   at [CodeMash 2014](http://codemash.org/)
 
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-## Copyright
+## License and Copyright
 
 *Concurrent Ruby* is Copyright © 2013 [Jerry D'Antonio](https://twitter.com/jerrydantonio).
-It is free software and may be redistributed under the terms specified in the LICENSE file.
-
-## License
-
-Released under the MIT license.
-
-http://www.opensource.org/licenses/mit-license.php  
-
-> Permission is hereby granted, free of charge, to any person obtaining a copy  
-> of this software and associated documentation files (the "Software"), to deal  
-> in the Software without restriction, including without limitation the rights  
-> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell  
-> copies of the Software, and to permit persons to whom the Software is  
-> furnished to do so, subject to the following conditions:  
-> 
-> The above copyright notice and this permission notice shall be included in  
-> all copies or substantial portions of the Software.  
-> 
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR  
-> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  
-> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE  
-> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER  
-> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,  
-> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN  
-> THE SOFTWARE.  
+It is free software released under the [MIT License](http://www.opensource.org/licenses/MIT).

data/lib/concurrent.rb

@@ -21,6 +21,7 @@ require 'concurrent/global_thread_pool'
 
 require 'concurrent/cached_thread_pool'
 require 'concurrent/fixed_thread_pool'
+require 'concurrent/immediate_executor'
 
 require 'concurrent/event_machine_defer_proxy' if defined?(EventMachine)
 

data/lib/concurrent/agent.rb

@@ -28,6 +28,7 @@ module Concurrent
       @rescuers = []
       @validator = nil
       @timeout = opts[:timeout] || TIMEOUT
+      init_mutex
       set_deref_options(opts)
     end
 

data/lib/concurrent/contract.rb

@@ -7,6 +7,7 @@ module Concurrent
 
     def initialize(opts = {})
       @state = :pending
+      init_mutex
       set_deref_options(opts)
     end
 

data/lib/concurrent/dereferenceable.rb

@@ -21,8 +21,8 @@ module Concurrent
     #   returning the value returned from the proc (default: `nil`)
     def set_deref_options(opts = {})
       mutex.synchronize do
-        @dup_on_deref = opts[:dup_on_deref] || opts[:dup] || false
-        @freeze_on_deref = opts[:freeze_on_deref] || opts[:freeze] || false
+        @dup_on_deref = opts[:dup_on_deref] || opts[:dup]
+        @freeze_on_deref = opts[:freeze_on_deref] || opts[:freeze]
         @copy_on_deref = opts[:copy_on_deref] || opts[:copy]
         @do_nothing_on_deref = ! (@dup_on_deref || @freeze_on_deref || @copy_on_deref)
       end
@@ -33,7 +33,7 @@ module Concurrent
     def value
       return nil if @value.nil?
       return @value if @do_nothing_on_deref
-      return mutex.synchronize do
+      mutex.synchronize do
         value = @value
         value = @copy_on_deref.call(value) if @copy_on_deref
         value = value.dup if @dup_on_deref
@@ -45,9 +45,12 @@ module Concurrent
 
     protected
 
-    # @private
     def mutex # :nodoc:
-      @mutex ||= Mutex.new
+      @mutex
+    end
+
+    def init_mutex
+      @mutex = Mutex.new
     end
   end
 end

data/lib/concurrent/event.rb

@@ -20,14 +20,16 @@ module Concurrent
     def initialize
       @set = false
       @mutex = Mutex.new
-      @waiters = []
+      @condition = ConditionVariable.new
     end
 
     # Is the object in the set state?
     #
     # @return [Boolean] indicating whether or not the `Event` has been set
     def set?
-      return @set == true
+      @mutex.synchronize do
+        @set
+      end
     end
 
     # Trigger the event, setting the state to `set` and releasing all threads
@@ -35,12 +37,13 @@ module Concurrent
     #
     # @return [Boolean] should always return `true`
     def set
-      return true if set?
       @mutex.synchronize do
+        return true if @set
         @set = true
-        @waiters.each {|waiter| waiter.run if waiter.status == 'sleep'}
+        @condition.broadcast
       end
-      return true
+
+      true
     end
 
     # Reset a previously set event back to the `unset` state.
@@ -48,12 +51,11 @@ module Concurrent
     #
     # @return [Boolean] should always return `true`
     def reset
-      return true unless set?
       @mutex.synchronize do
         @set = false
-        @waiters.clear # just in case there's garbage
       end
-      return true
+
+      true
     end
 
     # Wait a given number of seconds for the `Event` to be set by another
@@ -62,21 +64,11 @@ module Concurrent
     #
     # @return [Boolean] true if the `Event` was set before timeout else false
     def wait(timeout = nil)
-      return true if set?
-
-      @mutex.synchronize { @waiters << Thread.current }
-      return true if set? # if event was set while waiting for mutex
-
-      if timeout.nil?
-        slept = sleep
-      else
-        slept = sleep(timeout)
+      @mutex.synchronize do
+        return true if @set
+        @condition.wait(@mutex, timeout)
+        @set
       end
-    rescue
-      # let it fail
-    ensure
-      @mutex.synchronize { @waiters.delete(Thread.current) }
-      return set?
     end
   end
 end

data/lib/concurrent/future.rb

@@ -12,6 +12,7 @@ module Concurrent
     include UsesGlobalThreadPool
 
     def initialize(*args, &block)
+      init_mutex
       unless block_given?
         @state = :fulfilled
       else

data/lib/concurrent/immediate_executor.rb

@@ -0,0 +1,14 @@
+module Concurrent
+  class ImmediateExecutor
+
+    def post(*args, &block)
+      block.call(*args)
+    end
+
+    def <<(block)
+      post(&block)
+      self
+    end
+
+  end
+end

data/lib/concurrent/promise.rb

@@ -41,6 +41,7 @@ module Concurrent
       @children = []
       @rescuers = []
 
+      init_mutex
       realize(*args) if root?
     end
 

data/lib/concurrent/scheduled_task.rb

@@ -29,6 +29,7 @@ module Concurrent
       @state = :pending
       @schedule_time.freeze
       @task = block
+      init_mutex
       set_deref_options(opts)
 
       @thread = Thread.new{ work }

data/lib/concurrent/timer_task.rb

@@ -198,6 +198,7 @@ module Concurrent
       @run_now = opts[:now] || opts[:run_now] || false
 
       @task = block
+      init_mutex
       set_deref_options(opts)
     end
 

data/lib/concurrent/version.rb

@@ -1,3 +1,3 @@
 module Concurrent
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/md/actor.md

@@ -268,7 +268,7 @@ pool.each{|actor| overlord.add_worker(actor)}
 
 overlord.run! 
 
-pool.post('YAHOO')
+financial.post('YAHOO')
 
 #>> [2013-10-18 09:35:28 -0400] SENT 'YAHOO' from main to worker pool
 #>> [2013-10-18 09:35:28 -0400] RECEIVED 'YAHOO' to #<FinanceActor:0x0000010331af70>...

data/spec/concurrent/future_spec.rb

@@ -58,36 +58,37 @@ module Concurrent
 
     context 'fulfillment' do
 
+      before(:each) do
+        Future.thread_pool = ImmediateExecutor.new
+      end
+
       it 'passes all arguments to handler' do
-        @a = @b = @c = nil
-        f = Future.new(1, 2, 3) do |a, b, c|
-          @a, @b, @c = a, b, c
+        result = nil
+
+        Future.new(1, 2, 3) do |a, b, c|
+          result  = [a, b, c]
         end
-        sleep(0.1)
-        [@a, @b, @c].should eq [1, 2, 3]
+
+        result.should eq [1, 2, 3]
       end
 
       it 'sets the value to the result of the handler' do
         f = Future.new(10){|a| a * 2 }
-        sleep(0.1)
         f.value.should eq 20
       end
 
       it 'sets the state to :fulfilled when the block completes' do
         f = Future.new(10){|a| a * 2 }
-        sleep(0.1)
         f.should be_fulfilled
       end
 
       it 'sets the value to nil when the handler raises an exception' do
         f = Future.new{ raise StandardError }
-        sleep(0.1)
         f.value.should be_nil
       end
 
       it 'sets the state to :rejected when the handler raises an exception' do
         f = Future.new{ raise StandardError }
-        sleep(0.1)
         f.should be_rejected
       end
 

data/spec/concurrent/immediate_executor_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+module Concurrent
+
+  describe ImmediateExecutor do
+
+    let(:executor) { ImmediateExecutor.new }
+
+    context "#post" do
+      it 'executes the block using the arguments as parameters' do
+        result = executor.post(1, 2, 3, 4) { |a, b, c, d| [a, b, c, d] }
+        result.should eq [1, 2, 3, 4]
+      end
+    end
+
+    context "#<<" do
+
+      it "returns true" do
+        result = executor << proc { false }
+        result.should be_true
+      end
+
+      it "executes the passed callable" do
+        x = 0
+
+        executor << proc { x = 5 }
+
+        x.should eq 5
+      end
+
+    end
+  end
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: concurrent-ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jerry D'Antonio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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'
+date: 2014-02-03 00:00:00.000000000 Z
+dependencies: []
 description: |2
       Modern concurrency tools including agents, futures, promises, thread pools, actors, supervisors, and more.
       Inspired by Erlang, Clojure, Go, JavaScript, actors, and classic concurrency patterns.
@@ -50,6 +36,7 @@ files:
 - lib/concurrent/fixed_thread_pool/worker.rb
 - lib/concurrent/future.rb
 - lib/concurrent/global_thread_pool.rb
+- lib/concurrent/immediate_executor.rb
 - lib/concurrent/obligation.rb
 - lib/concurrent/postable.rb
 - lib/concurrent/promise.rb
@@ -82,6 +69,7 @@ files:
 - spec/concurrent/fixed_thread_pool_spec.rb
 - spec/concurrent/future_spec.rb
 - spec/concurrent/global_thread_pool_spec.rb
+- spec/concurrent/immediate_executor_spec.rb
 - spec/concurrent/obligation_shared.rb
 - spec/concurrent/postable_shared.rb
 - spec/concurrent/promise_spec.rb
@@ -100,26 +88,23 @@ homepage: http://www.concurrent-ruby.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2
-      future = Concurrent::Future.new{ 'Hello, world!' }
-      puts future.value
-      #=> Hello, world!
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Modern concurrency tools including agents, futures, promises, thread pools,
@@ -135,6 +120,7 @@ test_files:
 - spec/concurrent/fixed_thread_pool_spec.rb
 - spec/concurrent/future_spec.rb
 - spec/concurrent/global_thread_pool_spec.rb
+- spec/concurrent/immediate_executor_spec.rb
 - spec/concurrent/obligation_shared.rb
 - spec/concurrent/postable_shared.rb
 - spec/concurrent/promise_spec.rb