concur 0.1.2 → 1.0.0

data/{README.markdown → README.md}

@@ -1,5 +1,41 @@
 # Concur - A concurrency library for Ruby inspired by java.util.concurrency
 
+## NEW Go Style Usage
+
+```ruby
+require 'concur/go'
+
+# set max threads (optional)
+Concur.config.max_threads = 10
+
+# fire off blocks using go
+1.times do |i|
+  go do
+    puts "hello #{i}"
+    sleep 2
+    puts "#{i} awoke"
+    puts "hhi there"
+  end
+  puts "done #{i}"
+end
+
+# Use channels to communicate
+ch = Concur::Channel.new
+20.times do |i|
+  go(ch) do |ch|
+    puts "hello channel #{i} #{ch}"
+    sleep 2
+    # push to channel
+    ch << "pushed #{i} to channel"
+  end
+end
+
+# Read from channel
+ch.each do |x|
+  puts "Got #{x} from channel"
+end
+```
+
 ## General Usage
 
     # Choose which executor you want, there are several to choose from
@@ -23,6 +59,8 @@
 
 ## EventMachine / Non-blocking I/O
 
+DEPRECATED!!
+
 Perhaps more important/interesting these days is EventMachine/non-blocking io. When your program is io bound you can
 get similar performance (if not better) on a single thread as you can with multi-threads.
 

data/lib/concur/config.rb

@@ -0,0 +1,36 @@
+module Concur
+  class Config
+    attr_reader :defaults
+
+    def initialize(options={})
+      init_defaults
+      @listeners = []
+      @max_threads = options[:max_threads] || defaults[:max_threads]
+    end
+
+    def init_defaults
+      @defaults = {
+          max_threads: 20
+      }
+    end
+
+    def max_threads=(x)
+      @max_threads = x
+      notify_listeners(:max_threads=>x)
+    end
+
+    def max_threads
+      @max_threads
+    end
+
+    def add_listener(l)
+      @listeners << l
+    end
+
+    def notify_listeners(changes)
+      @listeners.each do |l|
+        l.update(changes)
+      end
+    end
+  end
+end

data/lib/concur/go.rb

@@ -0,0 +1,57 @@
+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
+

data/lib/concur.rb

@@ -1,10 +1,12 @@
+require 'logger'
 
+require_relative 'concur/config'
 require_relative 'executor'
 require_relative 'thread_pool'
 
-require 'logger'
 module Concur
   @@logger = Logger.new(STDOUT)
+  @@config = Config.new
 
   def self.logger
     @@logger
@@ -13,4 +15,8 @@ module Concur
     @@logger = logger
   end
 
+  def self.config
+    @@config ||= Config.new
+  end
+
 end

data/lib/executor.rb

@@ -26,7 +26,7 @@ module Concur
       end
 
       def http_request(params, &blk)
-
+        puts 'http_request is deprecated'
         f = StandardFuture.new do
           conn = Faraday.new(:url => params[:base_url]) do |builder|
   #          builder.use Faraday::Request::UrlEncoded # convert request params as "www-form-urlencoded"
@@ -50,7 +50,7 @@ module Concur
           end
           response
         end
-        @thread_pool.process(f)
+        process(f)
         f
       end
 
@@ -78,19 +78,19 @@ module Concur
       executor = ThreadPool.new(max_size)
       executor
     end
-
-    def self.new_eventmachine_executor()
-      require_relative 'executors/event_machine_executor'
-      executor = EventMachineExecutor.new()
-      executor
-    end
-
-    # NOT WORKING
-    def self.new_neverblock_executor(max_size)
-      require_relative 'executors/never_block_executor'
-      executor = NeverBlockExecutor.new(max_size)
-      executor
-    end
+    #
+    #def self.new_eventmachine_executor()
+    #  require_relative 'executors/event_machine_executor'
+    #  executor = EventMachineExecutor.new()
+    #  executor
+    #end
+    #
+    ## NOT WORKING
+    #def self.new_neverblock_executor(max_size)
+    #  require_relative 'executors/never_block_executor'
+    #  executor = NeverBlockExecutor.new(max_size)
+    #  executor
+    #end
 
 
   end
@@ -98,14 +98,14 @@ module Concur
 
   # todo: should maybe have these backends extend Executor and just override what's necessary
   class SingleThreaded < Executor::Base
-    def process(f=nil, &blk)
-      f = StandardFuture.new(f, &blk)
+    def process(f=nil, channel=nil, &blk)
+      f = StandardFuture.new(f, channel, &blk)
       f.call
       f
     end
 
-    def execute(f=nil, &blk)
-         process(f, &blk)
+    def execute(f=nil, channel=nil, &blk)
+         process(f, channel, &blk)
        end
 
     def shutdown
@@ -114,8 +114,8 @@ module Concur
 
   # Spins off a new thread per job
   class MultiThreaded < Executor::Base
-    def process(f=nil, &blk)
-      f = StandardFuture.new(f, &blk)
+    def process(f=nil, channel=nil, &blk)
+      f = StandardFuture.new(f, channel, &blk)
       @thread = Thread.new do
         f.call
       end
@@ -123,8 +123,8 @@ module Concur
       f
     end
 
-    def execute(f=nil, &blk)
-      process(f, &blk)
+    def execute(f=nil, channel=nil, &blk)
+      process(f, channel, &blk)
     end
 
     def shutdown

data/lib/future.rb

@@ -16,34 +16,33 @@ module Concur
 
     attr_accessor :thread, :ex
 
-    def initialize(runnable=nil, &block)
+    def initialize(runnable=nil, channel=nil, &block)
 
       @mutex = Mutex.new
       @cv = ConditionVariable.new
       @callable = runnable
+      @channel = channel
       if block_given?
         @callable = block
       end
 
     end
 
-    def run
+    def run(channel=nil)
       #Concur.logger.debug 'running StandardFuture'
       begin
-        @result = @callable.call
+        @result = @callable.call(@channel)
         Concur.logger.debug 'callable result: ' + @result.inspect
       rescue Exception => ex
-        Concur.logger.debug "Error occurred! #{ex.class.name}: #{ex.message}"
+        Concur.logger.debug "Error occurred! #{ex.class.name}: #{ex.message}: " + ex.backtrace.inspect
         @ex = ex
       end
-      @mutex.synchronize do # do we even need to synchronize? run should only ever be called once
-        @complete = true
-      end
+      @complete = true
       @cv.broadcast
 
     end
 
-    def call
+    def call(channel=nil)
       run
     end
 

data/lib/thread_pool.rb

@@ -27,6 +27,13 @@ module Concur
       @running = false
     end
 
+    # listen for config changes
+    def update(changes)
+      if changes[:max_threads]
+        @max_size = changes[:max_threads]
+        puts "Changed max size to #{changes[:max_threads]}"
+      end
+    end
 
     def process(callable, &blk)
       callable = blk if block_given?
@@ -34,8 +41,8 @@ module Concur
       start_thread
     end
 
-    def execute(runnable=nil, &blk)
-      f = StandardFuture.new(runnable, &blk)
+    def execute(runnable=nil, channel=nil, &blk)
+      f = StandardFuture.new(runnable, channel, &blk)
       process(f)
       f
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concur
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-28 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: &11255500 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *11255500
-- !ruby/object:Gem::Dependency
-  name: em-http-request
-  requirement: &11254080 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *11254080
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &11253020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11253020
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: &11252360 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *11252360
 - !ruby/object:Gem::Dependency
-  name: em-http-request
-  requirement: &11074580 !ruby/object:Gem::Requirement
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,18 +37,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11074580
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: &11669620 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *11669620
 description: A concurrency library for Ruby inspired by java.util.concurrency. By
   http://www.appoxy.com
 email: travis@appoxy.com
@@ -84,10 +50,12 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.markdown
-- README.markdown
+- README.md
 files:
 - lib/completer.rb
 - lib/concur.rb
+- lib/concur/config.rb
+- lib/concur/go.rb
 - lib/executor.rb
 - lib/executors/event_machine_executor.rb
 - lib/executors/never_block_executor.rb
@@ -96,7 +64,7 @@ files:
 - lib/runnable.rb
 - lib/thread_pool.rb
 - LICENSE.markdown
-- README.markdown
+- README.md
 homepage: http://github.com/appoxy/concur/
 licenses: []
 post_install_message: 
@@ -117,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A concurrency library for Ruby inspired by java.util.concurrency. By http://www.appoxy.com