agent 0.9.1 → 0.10.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 22c5bf05cd41b0171dfce316431f8c42434fa3c1
+  data.tar.gz: 96b5280262b5c4412fd366b6eb897031fa6fd709
+SHA512:
+  metadata.gz: 3aa2fcea9b6cf2e55abd8ff3f3139f12f88e8fae2304bddb4d9076ce2d5ba99959fe64cd60291a24433da577aeea104fa6c4fcf7f1d9d9f1e98c88b8037a5b0f
+  data.tar.gz: dbf9aedd6e99043347dba38415f80d7fa166afa1d36abcea0d3c61964d9b09e53f3b5c681e194836b3e7db390166580a749d801a2318ed5076b95a9c05a92618

data/.ruby-gemset

@@ -0,0 +1 @@
+agent

data/.travis.yml

@@ -0,0 +1,16 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - ree
+  - 1.9.2
+  - 1.9.3
+  - 2.0
+  - 2.1
+  - 2.2
+  - ruby-head
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
+  - rbx-2.2
+  - rbx-2.4
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    agent (0.9.0)
+    agent (0.9.1)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -1,9 +1,9 @@
-# Agent
+# Agent [![Build Status](https://travis-ci.org/igrigorik/agent.png)](https://travis-ci.org/igrigorik/agent)
 
 Agent is an attempt at [Go-like (CSP / pi-calculus) concurrency in Ruby](http://www.igvita.com/2010/12/02/concurrency-with-actors-goroutines-ruby/), but with an additional twist. It is a collection of different [process calculi](http://en.wikipedia.org/wiki/Process_calculus) primitives and patterns, with no specific, idiomatic affiliation to any specific implementation. A few available patterns so far:
 
  - Goroutines on top of green Ruby threads
- - Named, Typed, Bufferd and Unbufferred in-memory "channels"
+ - Named, Typed, Buffered and Unbufferred in-memory "channels"
  - Selectable "channels"
 
 This gem is a work in progress, so treat it as such.

data/lib/agent/channel.rb

@@ -10,23 +10,20 @@ module Agent
   end
 
   class Channel
-    attr_reader :name, :direction, :type, :max
+    ::Agent::Push::SKIP_MARSHAL_TYPES << ::Agent::Channel
 
-    def initialize(*args)
-      opts         = args.last.is_a?(Hash) ? args.pop : {}
-      @type        = args.shift
-      @max         = args.shift  || 0
-      @closed      = false
-      @name        = opts[:name] || UUID.generate
-      @direction   = opts[:direction] || :bidirectional
-      @close_mutex = Mutex.new
-      @queue       = Queues.register(@name, @type, @max)
-    end
+    attr_reader :name, :direction, :type, :max, :queue
 
-    def queue
-      q = @queue
-      raise Errors::ChannelClosed unless q
-      q
+    def initialize(*args)
+      opts          = args.last.is_a?(Hash) ? args.pop : {}
+      @type         = args.shift
+      @max          = args.shift  || 0
+      @closed       = false
+      @name         = opts[:name] || UUID.generate
+      @direction    = opts[:direction] || :bidirectional
+      @skip_marshal = opts[:skip_marshal]
+      @close_mutex  = Mutex.new
+      @queue        = Queues.register(@name, @type, @max)
     end
 
 
@@ -48,7 +45,9 @@ module Agent
 
     def send(object, options={})
       check_direction(:send)
-      queue.push(object, options)
+      q = queue
+      raise Errors::ChannelClosed unless q
+      q.push(object, {:skip_marshal => @skip_marshal}.merge(options))
     end
     alias :push :send
     alias :<<   :send
@@ -61,7 +60,9 @@ module Agent
 
     def receive(options={})
       check_direction(:receive)
-      queue.pop(options)
+      q = queue
+      return [nil, false] unless q
+      q.pop(options)
     end
     alias :pop  :receive
 

data/lib/agent/pop.rb

@@ -34,11 +34,9 @@ module Agent
 
     def send
       @mutex.synchronize do
-        raise Errors::ChannelClosed if @closed
-
         if @blocking_once
           _, error = @blocking_once.perform do
-            @object = Marshal.load(yield)
+            @object = yield unless @closed
             @received = true
             @cvar.signal
             @notifier.notify(self) if @notifier
@@ -47,7 +45,7 @@ module Agent
           return error
         else
           begin
-            @object = Marshal.load(yield)
+            @object = yield unless @closed
             @received = true
             @cvar.signal
             @notifier.notify(self) if @notifier

data/lib/agent/push.rb

@@ -2,10 +2,36 @@ require "agent/errors"
 
 module Agent
   class Push
+    SKIP_MARSHAL_TYPES = [
+      ::Symbol,
+      ::Numeric,
+      ::NilClass,
+      ::TrueClass,
+      ::FalseClass,
+      ::Queue,
+      ::SizedQueue,
+      ::Thread,
+      ::Mutex,
+      ::Monitor,
+      ::Module,
+      ::IO,
+      ::Proc,
+      ::Method
+    ]
+
     attr_reader :object, :uuid, :blocking_once, :notifier
 
     def initialize(object, options={})
-      @object        = Marshal.dump(object)
+      @object = case object
+                when *SKIP_MARSHAL_TYPES
+                  object
+                else
+                  if options[:skip_marshal]
+                    object
+                  else
+                    Marshal.load(Marshal.dump(object))
+                  end
+                end
       @uuid          = options[:uuid] || UUID.generate
       @blocking_once = options[:blocking_once]
       @notifier      = options[:notifier]

data/lib/agent/queue.rb

@@ -82,7 +82,7 @@ module Agent
       pop = Pop.new(options)
 
       mutex.synchronize do
-        raise Errors::ChannelClosed if @closed
+        pop.close if @closed
         operations << pop
         pops << pop
         process

data/lib/agent/selector.rb

@@ -103,7 +103,7 @@ module Agent
     end
 
     def execute_case(operation)
-      raise Errors::ChannelClosed if operation.closed?
+      raise Errors::ChannelClosed if operation.closed? && operation.is_a?(Agent::Push)
 
       cse = @cases[operation.uuid]
       blk, direction = cse.blk, cse.direction

data/lib/agent/version.rb

@@ -1,3 +1,3 @@
 module Agent
-  VERSION = "0.9.1"
+  VERSION = "0.10.0"
 end

data/spec/channel_spec.rb

@@ -109,9 +109,9 @@ describe Agent::Channel do
       lambda { @c.send("a") }.should raise_error(Agent::Errors::ChannelClosed)
     end
 
-    it "should raise an error when receiving from a channel that has already been closed" do
+    it "should return [nil, false] when receiving from a channel that has already been closed" do
       @c.close
-      lambda { @c.receive }.should raise_error(Agent::Errors::ChannelClosed)
+      @c.receive.should == [nil, false]
     end
   end
 
@@ -213,4 +213,28 @@ describe Agent::Channel do
     end
   end
 
+  context "marshaling" do
+    it "marshals data by default" do
+      c = channel!(String, 1)
+      string = "foo"
+      c.send(string)
+      string_copy = c.receive[0]
+      string_copy.should == string
+      string_copy.object_id.should_not == string.object_id
+    end
+
+    it "skips marshaling when configured to" do
+      c = channel!(String, 1, :skip_marshal => true)
+      string = "foo"
+      c.send(string)
+      c.receive[0].object_id.should == string.object_id
+    end
+
+    it "skips marshaling for channels by default" do
+      c = channel!(Agent::Channel, 1)
+      c.send(c)
+      c.receive[0].object_id.should == c.object_id
+    end
+  end
 end
+

data/spec/pop_spec.rb

@@ -15,16 +15,16 @@ describe Agent::Pop do
     end
 
     it "should run multiple times" do
-      @pop.send{Marshal.dump(1)}
+      @pop.send{1}
       @pop.should be_received
-      @pop.send{Marshal.dump(2)}
+      @pop.send{2}
       @pop.object.should == 2
     end
 
     it "should continue when received" do
       go!{ @pop.wait; @ack.send(Time.now) }
       sleep 0.2
-      @pop.send{Marshal.dump(1)}
+      @pop.send{1}
 
       s, _ = @ack.receive
 
@@ -41,11 +41,23 @@ describe Agent::Pop do
       (Time.now - s).should be_within(0.01).of(0)
     end
 
-    it "be able to be gracefully rolled back" do
+    it "should be able to be gracefully rolled back" do
       @pop.should_not be_received
       @pop.send{ raise Agent::Errors::Rollback }
       @pop.should_not be_received
     end
+
+    it "should continue when it was already closed" do
+      @pop.close
+
+      go!{ @pop.wait; @ack.send(Time.now) }
+
+      sleep 0.2
+
+      s, _ = @ack.receive
+
+      (Time.now - s).should be_within(0.01).of(0.2)
+    end
   end
 
   context "with a blocking_once" do
@@ -56,11 +68,12 @@ describe Agent::Pop do
 
     it "should only send only once" do
       @blocking_once.should_not be_performed
-      @pop.send{Marshal.dump(1)}
+      @pop.send{1}
       @pop.should be_received
       @blocking_once.should be_performed
+      @pop.object.should == 1
 
-      @pop.send{Marshal.dump(2)}
+      @pop.send{2}
       @pop.object.should == 1
 
       lambda{@pop.send{raise "an error"} }.should_not raise_error
@@ -73,6 +86,20 @@ describe Agent::Pop do
       @blocking_once.should_not be_performed
       @pop.should_not be_received
     end
+
+    it "should send only once even when it is closed" do
+      @pop.close
+      @blocking_once.should_not be_performed
+      @pop.send{1}
+      @pop.should be_received
+      @blocking_once.should be_performed
+      @pop.object.should == nil
+
+      @pop.send{2}
+      @pop.object.should == nil
+
+      lambda{@pop.send{raise "an error"} }.should_not raise_error
+    end
   end
 
   context "with a notifier" do
@@ -83,7 +110,7 @@ describe Agent::Pop do
 
     it "should notify when being sent" do
       @notifier.should_not be_notified
-      @pop.send{Marshal.dump(1)}
+      @pop.send{1}
       @notifier.should be_notified
     end
 

data/spec/push_spec.rb

@@ -29,7 +29,7 @@ describe Agent::Push do
 
       s, _ = @ack.receive
 
-      (Time.now - s).should be_within(0.01).of(0)
+      (Time.now - s).should be_within(0.02).of(0)
     end
 
     it "should raise an error on the waiter when closed" do
@@ -44,6 +44,35 @@ describe Agent::Push do
     end
   end
 
+  context "marshaling" do
+    let(:object){ "foo" }
+    let(:skip_marshal){ false }
+    let(:push){ Agent::Push.new(object, :skip_marshal => skip_marshal) }
+
+    it "makes a copy of the object" do
+      push.object.should == object
+      push.object.object_id.should_not == object.object_id
+    end
+
+    context "with an object type that skips marshaling" do
+      let(:object){ ::Queue.new }
+
+      it "does not make a copy of the object" do
+        push.object.should == object
+        push.object.object_id.should == object.object_id
+      end
+    end
+
+    context "when skip_marshal is true" do
+      let(:skip_marshal){ true }
+
+      it "does not make a copy of the object" do
+        push.object.should == object
+        push.object.object_id.should == object.object_id
+      end
+    end
+  end
+
   context "with a blocking_once" do
     before do
       @blocking_once = Agent::BlockingOnce.new

data/spec/queue_spec.rb

@@ -158,11 +158,20 @@ describe Agent::Queue do
         @queue.queue.size.should == 0
       end
 
-      it "should raise an error when being acted upon afterwards" do
-        @queue.close
-        lambda{ @queue.close }.should raise_error(Agent::Errors::ChannelClosed)
-        lambda{ @queue.push("1") }.should raise_error(Agent::Errors::ChannelClosed)
-        lambda{ @queue.pop }.should raise_error(Agent::Errors::ChannelClosed)
+      context "after it is closed" do
+        before{ @queue.close }
+
+        it "should raise an error when #close is called again" do
+          lambda{ @queue.close }.should raise_error(Agent::Errors::ChannelClosed)
+        end
+
+        it "should raise an error when a value is pushed onto the queue" do
+          lambda{ @queue.push("1") }.should raise_error(Agent::Errors::ChannelClosed)
+        end
+
+        it "should return [nil, false] when popping from the queue" do
+          @queue.pop.should == [nil, false]
+        end
       end
     end
 
@@ -322,11 +331,20 @@ describe Agent::Queue do
         @queue.pushes.size.should == 0
       end
 
-      it "should raise an error when being acted upon afterwards" do
-        @queue.close
-        lambda{ @queue.close }.should raise_error(Agent::Errors::ChannelClosed)
-        lambda{ @queue.push("1") }.should raise_error(Agent::Errors::ChannelClosed)
-        lambda{ @queue.pop }.should raise_error(Agent::Errors::ChannelClosed)
+      context "after it is closed" do
+        before{ @queue.close }
+
+        it "should raise an error when #close is called again" do
+          lambda{ @queue.close }.should raise_error(Agent::Errors::ChannelClosed)
+        end
+
+        it "should raise an error when a value is pushed onto the queue" do
+          lambda{ @queue.push("1") }.should raise_error(Agent::Errors::ChannelClosed)
+        end
+
+        it "should return [nil, false] when popping from the queue" do
+          @queue.pop.should == [nil, false]
+        end
       end
     end
 

data/spec/selector_spec.rb

@@ -108,17 +108,26 @@ describe Agent::Selector do
       r.first.should == :default
     end
 
-    it "should raise an error if the channel is closed out from under it" do
+    it "should raise an error if the channel is closed out from under it and you are sending to it" do
       go!{ sleep 0.25; @c.close }
 
       lambda {
         select! do |s|
           s.case(@c, :send, 1)
-          s.case(@c, :receive)
         end
       }.should raise_error(Agent::Errors::ChannelClosed)
     end
 
+    it "should not raise an error if the channel is closed out from under it and you are receiving from it" do
+      go!{ sleep 0.25; @c.close }
+
+      lambda {
+        select! do |s|
+          s.case(@c, :receive){}
+        end
+      }.should_not raise_error
+    end
+
     context "select immediately available channel" do
       it "should select read channel" do
         c = channel!(Integer)
@@ -291,7 +300,7 @@ describe Agent::Selector do
       r.first.should == :default
     end
 
-    it "should raise an error if the channel is closed out from under it" do
+    it "should raise an error if the channel is closed out from under it and you are sending to it" do
       @c.send(1)
 
       go!{ sleep 0.25; @c.close }
@@ -299,11 +308,20 @@ describe Agent::Selector do
       lambda {
         select! do |s|
           s.case(@c, :send, 1)
-          s.case(@c, :send, 2)
         end
       }.should raise_error(Agent::Errors::ChannelClosed)
     end
 
+    it "should not raise an error if the channel is closed out from under it and you are receiving from it" do
+      go!{ sleep 0.25; @c.close }
+
+      lambda {
+        select! do |s|
+          s.case(@c, :receive){}
+        end
+      }.should_not raise_error
+    end
+
     context "select immediately available channel" do
       it "should select read channel" do
         c = channel!(Integer, 1)

data/spec/spec_helper.rb

@@ -14,6 +14,7 @@ RSpec.configure do |config|
   config.filter_run :focus
 
   config.filter_run_excluding :vm => lambda { |version|
-    !(Config::CONFIG['ruby_install_name'] =~ /^#{version.to_s}/)
+    c = defined?(RbConfig) ? RbConfig : Config
+    !(c::CONFIG['ruby_install_name'] =~ /^#{version.to_s}/)
   }
 end

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: agent
 version: !ruby/object:Gem::Version
-  version: 0.9.1
-  prerelease: 
+  version: 0.10.0
 platform: ruby
 authors:
 - Ilya Grigorik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Agent is a diverse family of related approaches for modelling concurrent
@@ -51,8 +46,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -106,27 +103,26 @@ files:
 - spec/wait_group_spec.rb
 homepage: https://github.com/igrigorik/agent
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: agent
-rubygems_version: 1.8.24
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Agent is a diverse family of related approaches for modelling concurrent
   systems, in Ruby
 test_files:
@@ -149,4 +145,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/uuid_spec.rb
 - spec/wait_group_spec.rb
-has_rdoc: