tribe 0.0.2 → 0.0.3

data/Rakefile

@@ -55,37 +55,80 @@ end
 
 require 'tribe'
 
+#
+# TODO: Temporary benchmarking/demo code.
+#
+
+require 'benchmark'
+
+$demo_queue = Queue.new
+
+DEMO_ACTOR_COUNT = 100
+DEMO_MSG_COUNT = 3000
+
 class MyActor < Tribe::Actor
+
   def pre_init
-    @count = 0
+    reset_count
   end
 
   def increment
     @count += 1
-    puts "#{@name}=#{@count}" if @count >= 50000
+
+    if @count >= DEMO_MSG_COUNT
+      puts "#{@name} done."
+      $demo_queue.push(@name)
+    end
+  end
+
+  def reset_count
+    @count = 0
   end
 
   def go(friend_name)
     friend = Tribe.registry[friend_name]
 
-    50000.times do
+    DEMO_MSG_COUNT.times do
       friend.increment!
     end
   end
 end
 
 def tribe_demo
-  a1 = Tribe.registry['a1'] || MyActor.new(:name => 'a1')
-  a2 = Tribe.registry['a2'] || MyActor.new(:name => 'a2')
-  a3 = Tribe.registry['a3'] || MyActor.new(:name => 'a3')
-  a4 = Tribe.registry['a4'] || MyActor.new(:name => 'a4')
-  a5 = Tribe.registry['a5'] || MyActor.new(:name => 'a5')
-  a6 = Tribe.registry['a6'] || MyActor.new(:name => 'a6')
-
-  a1.go!('a2')
-  a2.go!('a1')
-  a3.go!('a4')
-  a4.go!('a3')
-  a5.go!('a6')
-  a6.go!('a5')
+  actors = []
+
+  puts 'Create actors...'
+  (0...DEMO_ACTOR_COUNT).each do |i|
+    name = i.to_s
+    actor = Tribe.registry[name] || MyActor.new(:name => name)
+    actors.push(actor)
+    puts name
+  end
+
+  puts 'Resetting...'
+  actors.each do |actor|
+    actor.reset_count!
+  end
+
+  puts 'Go...'
+  actors.each do |actor|
+    friend = actor.name.to_i
+    friend += 1
+    friend = 0 if friend == DEMO_ACTOR_COUNT
+    friend = friend.to_s
+
+    puts "pair: #{actor.name}, #{friend}"
+    actor.go!(friend)
+  end
+
+  puts 'Benchmark...'
+  result = Benchmark.realtime do
+    DEMO_ACTOR_COUNT.times do
+      $demo_queue.pop
+    end
+  end
+
+  puts result
+
+  nil
 end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/tribe.rb

@@ -3,23 +3,29 @@ require 'thread'
 require 'set'
 
 require 'tribe/actor'
-require 'tribe/singleton'
 require 'tribe/worker'
-require 'tribe/scheduler'
+require 'tribe/dispatcher'
 require 'tribe/registry'
-require 'tribe/clock'
+require 'tribe/scheduler'
 require 'tribe/timer'
+require 'tribe/message'
+require 'tribe/mailbox'
+require 'tribe/thread_pool'
 
 module Tribe
-  def self.scheduler
-    Tribe::Scheduler.instance
+  def self.dispatcher
+    @dispatcher ||= Tribe::Dispatcher.new
   end
 
   def self.registry
-    Tribe::Registry.instance
+    @registry ||= Tribe::Registry.new
   end
 
-  def self.clock
-    Tribe::Clock.instance
+  def self.scheduler
+    @scheduler ||= Tribe::Scheduler.new
   end
 end
+
+Tribe.dispatcher
+Tribe.registry
+Tribe.scheduler

data/lib/tribe/actor.rb

@@ -6,7 +6,7 @@ module Tribe
       run_hook(:pre_init)
 
       @alive = true
-      @process_lock = Mutex.new
+      @mailbox = Mailbox.new
       @name = options[:name].freeze
 
       Tribe.registry.register(self)
@@ -26,20 +26,25 @@ module Tribe
     end
 
     def tell(method, *args)
-      Tribe.scheduler.send(:schedule) do
-        process(:method => method, :args => args)
+      message = { :method => method, :args => args }
+      @mailbox.deliver(message)
+
+      Tribe.dispatcher.send(:schedule) do
+        process
       end
 
       true
     end
 
     private
-    def process(message)
-      @process_lock.synchronize do
+    def process
+      @mailbox.retrieve_each do |message|
         begin
-          send(message[:method], *message[:args]) if @alive
+          send(message[:method], *message[:args])
+          true
         rescue Exception => e
-          @alive = false
+          puts "Actor died while processing: #{e.message}\n#{e.backtrace.join("\n")}"
+          false
         end
       end
     end

data/lib/tribe/dispatcher.rb

@@ -0,0 +1,16 @@
+module Tribe
+  class Dispatcher
+    def initialize(options = {})
+      @pool = ThreadPool.new(:count => options[:count])
+    end
+
+    def shutdown
+      @pool.shutdown
+    end
+
+    private
+    def schedule(&block)
+      @pool.dispatch(&block)
+    end
+  end
+end

data/lib/tribe/mailbox.rb

@@ -0,0 +1,39 @@
+module Tribe
+  class Mailbox
+    RETRIEVE_CAP = -1 # Disable's the cap by default.
+
+    def initialize
+      @messages = Queue.new
+      @retrieve_lock = Mutex.new
+    end
+
+    # Returns true if it ran to completion, false if interupted.
+    # Block must return true on success, false on failure.
+    def retrieve_each(max = RETRIEVE_CAP, &block)
+      @retrieve_lock.synchronize do
+        count = 0
+
+        @messages.length.times do
+          if max >= 0 && count >= max
+            break
+          else
+            count += 1
+          end
+
+          message = @messages.pop
+
+          unless block.call(message)
+            return false
+          end
+        end
+
+        return true
+      end
+    end
+
+    def deliver(message)
+      @messages.push(message)
+      true
+    end
+  end
+end

data/lib/tribe/message.rb

@@ -0,0 +1,15 @@
+module Tribe
+  class Message
+    attr_reader :from
+    attr_reader :to
+    attr_reader :method
+    attr_reader :args
+
+    def initialize(from, to, method, *args)
+      @from = from
+      @to = to
+      @method = method
+      @args = args
+    end
+  end
+end

data/lib/tribe/registry.rb

@@ -1,6 +1,5 @@
 module Tribe
-  class Registry < Tribe::Singleton
-
+  class Registry
     def initialize
       @lock = Mutex.new
 

data/lib/tribe/scheduler.rb

@@ -1,32 +1,77 @@
 module Tribe
-  class Scheduler < Tribe::Singleton
-    def initialize(opts = {})
-      @count = opts[:count] || 20
-      @workers = []
-      @messages = Queue.new
+  class Scheduler
+    FREQUENCY = 100 # Hz.
 
-      spawn(@count)
+    def initialize(options = {})
+      @frequency = options[:frequency] || FREQUENCY
+      @run = true
+      @timers = SortedSet.new
+      @messages = Queue.new
+      @thread = Thread.new { main }
     end
 
     def shutdown
-      @count.times do
-        @messages.push({ :command => :shutdown })
-      end
+      message = { :command => :shutdown }
+      @messages.push(message)
 
-      @workers.each do |worker|
-        worker.join
-      end
+      @thread.join
+    end
+
+    def schedule(timer)
+      message = { :command => :schedule, :timer => timer }
+      @messages.push(message)
+
+      true
+    end
+
+    def unschedule(timer)
+      message = { :command => :unschedule, :timer => timer }
+      @messages.push(message)
+
+      true
     end
 
     private
-    def schedule(&block)
-      @messages.push({ :command => :perform, :task => block })
+    def main
+      sleep_val = 1.0 / @frequency
+
+      while @run
+        sleep(sleep_val)
+        process_commands
+        fire_timers
+      end
     end
 
-    def spawn(count)
-      count.times do
-        worker = Worker.new(@messages)
-        @workers.push(worker)
+    def process_commands
+      @messages.length.times do
+        message = @messages.pop
+
+        case message[:command]
+        when :schedule
+          @timers.add(message[:timer])
+        when :unschedule
+          @timers.delete(message[:timer])
+        when :shutdown
+          @run = false
+        else
+          raise("Invalid command: #{message[:command]}")
+        end
+      end
+    end
+
+    def fire_timers
+      count = 0
+
+      while true
+        return 0 if @timers.empty?
+
+        if (timer = @timers.first).send(:fire?)
+          @timers.delete(timer)
+          timer.send(:fire)
+          count += 1
+        else
+          return count
+        end
       end
     end
   end

data/lib/tribe/thread_pool.rb

@@ -0,0 +1,58 @@
+module Tribe
+  class ThreadPool
+    THREAD_COUNT = 64
+
+    def initialize(options = {})
+      @count = options[:count] || THREAD_COUNT
+
+      @threads = []
+      @lock = Mutex.new
+      @queue = Queue.new
+
+      spawn(@count)
+    end
+
+    def dispatch(&block)
+      @queue.push({ :command => :perform, :task => block })
+
+      true
+    end
+
+    def shutdown
+      @lock.synchronize do
+        @count.times do
+          @queue.push({ :command => :shutdown })
+        end
+
+        @threads.each { |thread| thread.join }
+
+        true
+      end
+    end
+
+    private
+    def spawn(count)
+      count.times do
+        @lock.synchronize do
+          thread = Thread.new { thread_main }
+          @threads.push(thread)
+        end
+      end
+    end
+
+    def thread_main
+      while (message = @queue.pop)
+        case message[:command]
+        when :perform
+          begin
+            message[:task].call
+          rescue Exception => e
+            puts "Worker caught exception: #{e.message}\n#{e.backtrace.join("\n")}"
+          end
+        when :shutdown
+          return
+        end
+      end
+    end
+  end
+end

data/lib/tribe/timer.rb

@@ -6,14 +6,14 @@ module Tribe
     def initialize(seconds, options = {}, &block)
       @seconds = seconds.to_f
       @callback = block
-      @clock = options[:clock] || Tribe.clock
+      @scheduler = options[:scheduler] || Tribe.scheduler
       @repeat = options[:repeat] || false
 
       schedule
     end
 
     def cancel
-      @clock.unschedule(self)
+      @scheduler.unschedule(self)
     end
 
     def <=>(timer)
@@ -45,7 +45,7 @@ module Tribe
 
     def schedule
       @fire_at = now + @seconds
-      @clock.schedule(self)
+      @scheduler.schedule(self)
     end
   end
 end

data/spec/lib/tribe/dispatcher_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Tribe::Dispatcher do
+end

data/tribe.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "tribe"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Remesch"]
@@ -28,14 +28,16 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/tribe.rb",
     "lib/tribe/actor.rb",
-    "lib/tribe/clock.rb",
+    "lib/tribe/dispatcher.rb",
+    "lib/tribe/mailbox.rb",
+    "lib/tribe/message.rb",
     "lib/tribe/registry.rb",
     "lib/tribe/scheduler.rb",
-    "lib/tribe/singleton.rb",
+    "lib/tribe/thread_pool.rb",
     "lib/tribe/timer.rb",
     "lib/tribe/worker.rb",
     "spec/lib/tribe/actor_spec.rb",
-    "spec/lib/tribe/clock_spec.rb",
+    "spec/lib/tribe/dispatcher_spec.rb",
     "spec/lib/tribe/registry_spec.rb",
     "spec/lib/tribe/scheduler_spec.rb",
     "spec/lib/tribe/timer_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tribe
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -191,14 +191,16 @@ files:
 - VERSION
 - lib/tribe.rb
 - lib/tribe/actor.rb
-- lib/tribe/clock.rb
+- lib/tribe/dispatcher.rb
+- lib/tribe/mailbox.rb
+- lib/tribe/message.rb
 - lib/tribe/registry.rb
 - lib/tribe/scheduler.rb
-- lib/tribe/singleton.rb
+- lib/tribe/thread_pool.rb
 - lib/tribe/timer.rb
 - lib/tribe/worker.rb
 - spec/lib/tribe/actor_spec.rb
-- spec/lib/tribe/clock_spec.rb
+- spec/lib/tribe/dispatcher_spec.rb
 - spec/lib/tribe/registry_spec.rb
 - spec/lib/tribe/scheduler_spec.rb
 - spec/lib/tribe/timer_spec.rb
@@ -220,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4061265025390310383
+      hash: 1198643590868831764
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/tribe/clock.rb

@@ -1,78 +0,0 @@
-module Tribe
-  class Clock < Tribe::Singleton
-    FREQUENCY = 100 # Hz.
-
-    def initialize(options = {})
-      @frequency = options[:frequency] || FREQUENCY
-      @run = true
-      @timers = SortedSet.new
-      @messages = Queue.new
-      @thread = Thread.new { main }
-    end
-
-    def shutdown
-      message = { :command => :shutdown }
-      @messages.push(message)
-
-      @thread.join
-    end
-
-    def schedule(timer)
-      message = { :command => :schedule, :timer => timer }
-      @messages.push(message)
-
-      true
-    end
-
-    def unschedule(timer)
-      message = { :command => :unschedule, :timer => timer }
-      @messages.push(message)
-
-      true
-    end
-
-    private
-    def main
-      sleep_val = 1.0 / @frequency
-
-      while @run
-        sleep(sleep_val)
-        process_commands
-        fire_timers
-      end
-    end
-
-    def process_commands
-      @messages.length.times do
-        message = @messages.pop
-
-        case message[:command]
-        when :schedule
-          @timers.add(message[:timer])
-        when :unschedule
-          @timers.delete(message[:timer])
-        when :shutdown
-          @run = false
-        else
-          raise("Invalid command: #{message[:command]}")
-        end
-      end
-    end
-
-    def fire_timers
-      count = 0
-
-      while true
-        return 0 if @timers.empty?
-
-        if (timer = @timers.first).send(:fire?)
-          @timers.delete(timer)
-          timer.send(:fire)
-          count += 1
-        else
-          return count
-        end
-      end
-    end
-  end
-end

data/lib/tribe/singleton.rb

@@ -1,5 +0,0 @@
-module Tribe
-  class Singleton
-    include ::Singleton
-  end
-end

data/spec/lib/tribe/clock_spec.rb

@@ -1,4 +0,0 @@
-require 'spec_helper'
-
-describe Tribe::Clock do
-end