concur 2.0.0 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b75da71699ffaf065b8984ccae5b2ffc3da5b130
+  data.tar.gz: b3d7b9c60e085b239db6dfc9f7f7773c35ea2a48
+SHA512:
+  metadata.gz: 6247b021a6acf3c3755c8cdffb3b77da20d5e39209e484809ec7b4b897802f297c7b464ccfe92f7e5fe3b6ce8d81a4a2c5dd9d9bee4f41d974f444a6c351daa6
+  data.tar.gz: 134f27a9c74b0d975c1fe215c363cba43bb17119e376fdd2e9ed9981f9944efff5df531de7f9b67b185ed42330b54210cabfd727a78749bb6039a800c208b632

data/.gitignore

@@ -0,0 +1,3 @@
+/.idea
+/pkg
+*.sublime*

data/Rakefile

@@ -0,0 +1,18 @@
+require './lib/concur.rb'
+
+begin
+    require 'jeweler2'
+    Jeweler::Tasks.new do |gemspec|
+        gemspec.name = "concur"
+        gemspec.summary = "A concurrency library for Ruby inspired by java.util.concurrency and Go (golang). By http://www.appoxy.com"
+        gemspec.email = "travis@appoxy.com"
+        gemspec.homepage = "http://github.com/treeder/concur/"
+        gemspec.description = "A concurrency library for Ruby inspired by java.util.concurrency and Go (golang). By http://www.appoxy.com"
+        gemspec.authors = ["Travis Reeder"]
+        gemspec.files = FileList['lib/**/*.rb']
+    end
+    Jeweler::GemcutterTasks.new
+rescue LoadError
+    puts "Jeweler not available. Install it with: sudo gem install jeweler2"
+end
+

data/concur.gemspec

@@ -0,0 +1,25 @@
+
+require File.expand_path('../lib/concur/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["Travis Reeder"]
+  gem.email         = ["treeder@gmail.com"]
+  gem.description   = "A concurrency library for Ruby inspired by java.util.concurrency and Go (golang). By http://www.appoxy.com"
+  gem.summary       = "A concurrency library for Ruby inspired by java.util.concurrency and Go (golang). By http://www.appoxy.com"
+  gem.homepage      = "https://github.com/treeder/concur"
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "concur"
+  gem.require_paths = ["lib"]
+  gem.version       = Concur::VERSION
+
+  gem.required_rubygems_version = ">= 1.3.6"
+  gem.required_ruby_version = Gem::Requirement.new(">= 1.9")
+
+  gem.add_runtime_dependency "concur"
+
+  gem.add_development_dependency "test-unit"
+
+end

data/lib/concur/version.rb

@@ -0,0 +1,3 @@
+module Concur
+  VERSION = "2.1.0"
+end

data/lib/future.rb

@@ -34,12 +34,18 @@ module Concur
         @result = @callable.call(@channel)
         Concur.logger.debug 'callable result: ' + @result.inspect
       rescue Exception => ex
-        Concur.logger.debug "Error occurred! #{ex.class.name}: #{ex.message}: " + ex.backtrace.inspect
+        Concur.logger.info "Error occurred! #{ex.class.name}: #{ex.message}: " + ex.backtrace.inspect
         @ex = ex
       end
+      if @channel
+        r = (@result || @ex)
+        puts "pusing #{r} to channel"
+        @channel << r
+      end
       @complete = true
       @cv.broadcast
 
+
     end
 
     def call(channel=nil)

data/test/job.rb

@@ -0,0 +1,51 @@
+require_relative '../lib/runnable'
+require 'rest'
+
+class Job
+  include Concur::Runnable
+
+  def initialize(i, options={})
+    @i = i
+    if options[:em]
+      @em = true
+    end
+    @rest = Rest::Client.new
+  end
+
+  def em_request(url)
+    puts 'emrequest for ' + url
+    http = EventMachine::Protocols::HttpClient.request(
+        :host => url,
+        :port => 80,
+        :request => "/"
+    )
+    http.callback { |response|
+      puts response[:status]
+      puts response[:headers]
+      puts response[:content]
+    }
+  end
+
+  def run
+    puts "Starting #{@i}... em? #{@em}"
+#    sleep 1
+    urls = ["www.yahoo.com", "www.microsoft.com"] # , "www.github.com"
+    if @em
+      urls.each do |u|
+        em_request(u)
+      end
+    else
+      urls.each do |u|
+        get(u)
+      end
+    end
+    puts "Finished #{@i}"
+    "response #{@i}"
+  end
+
+  def get(url)
+    puts 'getting ' + url
+    @rest.get "http://#{url}"
+  end
+
+end

data/test/test_concur.rb

@@ -0,0 +1,89 @@
+gem 'test-unit'
+require 'test/unit'
+require 'rest'
+require_relative '../lib/concur'
+require_relative 'job'
+
+
+class TestConcur < Test::Unit::TestCase
+  @@durations = []
+
+  def test_speed_comparison
+    times = 10
+
+    # todo: use quicky gem
+
+    executor = Concur::Executor.new_single_threaded_executor
+    non_concurrent_duration = run_gets("non concurrent", executor)
+    executor.shutdown
+
+    executor = Concur::Executor.new_multi_threaded_executor
+    concurrent_duration = run_gets("multi thread", executor)
+    assert concurrent_duration < (non_concurrent_duration/2)
+    executor.shutdown
+
+    executor = Concur::Executor.new_thread_pool_executor(4)
+    pooled_duration = run_gets("thread pool", executor)
+    assert pooled_duration < (non_concurrent_duration/2)
+    executor.shutdown
+    #
+    #executor = Concur::Executor.new_eventmachine_executor()
+    #em_duration = run_gets("eventmachine", executor)
+    #assert em_duration < (non_concurrent_duration/2)
+    #executor.shutdown
+
+    puts "----"
+    @@durations.each do |s|
+      puts s
+    end
+
+  end
+
+  def run_gets(name, executor)
+    puts "Running #{name}..."
+    start_time = Time.now
+    rest = Rest::Client.new
+
+    futures = []
+    10.times do |i|
+      url = "http://rest-test.iron.io/code/200"
+      futures << executor.execute() do
+        response = rest.get(url)
+      end
+    end
+    futures.each do |f|
+      puts 'f=' + f.inspect
+#      puts 'got=' + f.get.inspect
+      assert f.get.code >= 200 && f.get.code < 400
+    end
+    concurrent_duration = Time.now - start_time
+    o = "#{name} duration=" + concurrent_duration.to_s
+    puts o
+    @@durations << o
+    concurrent_duration
+  end
+
+  def run_jobs(name, executor, times, options={})
+    puts "Running #{name}..."
+    start_time = Time.now
+
+    jobs = []
+    times.times do |i|
+      job = Job.new(i, options)
+      jobs << executor.execute(job)
+    end
+    jobs.each do |j|
+      puts "result=#{j.get}"
+    end
+    concurrent_duration = Time.now - start_time
+    o = "#{name} duration=" + concurrent_duration.to_s
+    puts o
+    @@durations << o
+    concurrent_duration
+  end
+
+
+end
+
+
+

data/test/tmp.rb

@@ -0,0 +1,13 @@
+require 'thread'
+
+@queue = Queue.new
+100.times do |i|
+  Thread.new do
+    @queue << "hi"
+  end
+end
+
+puts "waiting on channel..."
+while (x = @queue.pop(true)) do
+  puts "Got #{x} from channel"
+end

metadata

@@ -1,29 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: concur
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - Travis Reeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
-dependencies: []
+date: 2013-04-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: concur
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  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: A concurrency library for Ruby inspired by java.util.concurrency and
   Go (golang). By http://www.appoxy.com
-email: travis@appoxy.com
+email:
+- treeder@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
+extra_rdoc_files: []
+files:
+- .gitignore
 - LICENSE.markdown
 - README.md
-files:
+- Rakefile
+- concur.gemspec
 - lib/completer.rb
 - lib/concur.rb
 - lib/concur/config.rb
-- lib/concur/go.rb
+- lib/concur/version.rb
 - lib/executor.rb
 - lib/executors/event_machine_executor.rb
 - lib/executors/never_block_executor.rb
@@ -31,31 +62,34 @@ files:
 - lib/futures/event_machine_future.rb
 - lib/runnable.rb
 - lib/thread_pool.rb
-- LICENSE.markdown
-- README.md
-homepage: http://github.com/treeder/concur/
+- test/job.rb
+- test/test_concur.rb
+- test/tmp.rb
+homepage: https://github.com/treeder/concur
 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'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A concurrency library for Ruby inspired by java.util.concurrency and Go (golang).
   By http://www.appoxy.com
-test_files: []
+test_files:
+- test/job.rb
+- test/test_concur.rb
+- test/tmp.rb

data/lib/concur/go.rb

@@ -1,57 +0,0 @@
-module Kernel
-  def go(ch=nil, &blk)
-    future = Concur.gok.executor.execute(nil, ch, &blk)
-    future
-  end
-end
-
-module Concur
-  class GoKernel
-    def initialize(config)
-      @config = config
-      @executor = Concur::Executor.new_thread_pool_executor(@config.max_threads)
-      @config.add_listener(@executor)
-    end
-
-    def executor
-      @executor
-    end
-  end
-
-  @gok = GoKernel.new(Concur.config)
-
-  def self.gok
-    @gok
-  end
-
-  class Channel
-    def initialize
-      @queue = Queue.new
-    end
-
-    def <<(ob)
-      @queue << ob
-    end
-
-    def shift
-      begin
-        @queue.shift
-      rescue Exception => ex
-        #puts ex.class.name
-        #p ex
-        #p ex.message
-        if ex.class.name == "fatal" && ex.message.include?("deadlock")
-          return nil
-        end
-        raise ex
-      end
-    end
-
-    def each(&blk)
-      while (x = shift) do
-        yield x
-      end
-    end
-  end
-end
-