tribe 0.0.3 → 0.0.4

data/.gitignore

@@ -0,0 +1,21 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+.gitignore
+.DS_Store
+*.swp
+.rvmrc

data/Gemfile

@@ -1,15 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-group :development do
-  gem 'rdoc', '~> 3.12'
-  gem 'rspec', '~> 2.10.0'
-  gem 'bundler', '>= 1.1.0'
-  gem 'jeweler', '~> 1.8.3'
-  gem 'simplecov', '>= 0', :require => false
-  gem 'rb-fsevent', :require => false
-  gem 'guard', '~> 1.1.1'
-  gem 'guard-rspec', '~> 1.0.0'
-  #gem 'guard-bundler', '~> 0.1.3'
-  gem 'growl'
-  platform(:ruby) { gem 'debugger' }
-end
+# Specify your gem's dependencies in tribe.gemspec
+gemspec

data/Gemfile.lock

@@ -1,70 +1,16 @@
+PATH
+  remote: .
+  specs:
+    tribe (0.0.4)
+      workers (= 0.0.6)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    columnize (0.3.6)
-    debugger (1.1.4)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.3)
-    debugger-linecache (1.1.1)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.3)
-    diff-lcs (1.1.3)
-    ffi (1.0.11)
-    ffi (1.0.11-java)
-    git (1.2.5)
-    growl (1.0.3)
-    guard (1.1.1)
-      listen (>= 0.4.2)
-      thor (>= 0.14.6)
-    guard-rspec (1.0.0)
-      guard (>= 1.1)
-    jeweler (1.8.3)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.7.3)
-    json (1.7.3-java)
-    listen (0.4.4)
-      rb-fchange (~> 0.0.5)
-      rb-fsevent (~> 0.9.1)
-      rb-inotify (~> 0.8.8)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    rb-fchange (0.0.5)
-      ffi
-    rb-fsevent (0.9.1)
-    rb-inotify (0.8.8)
-      ffi (>= 0.5.0)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    simplecov (0.6.4)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    thor (0.15.2)
+    workers (0.0.6)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.1.0)
-  debugger
-  growl
-  guard (~> 1.1.1)
-  guard-rspec (~> 1.0.0)
-  jeweler (~> 1.8.3)
-  rb-fsevent
-  rdoc (~> 3.12)
-  rspec (~> 2.10.0)
-  simplecov
+  tribe!

data/{LICENSE.txt → LICENSE}

@@ -1,5 +1,7 @@
 Copyright (c) 2012 Chad Remesch
 
+MIT License
+
 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
@@ -17,4 +19,4 @@ 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.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,29 @@
+# Tribe
+
+Actor Model for Ruby.  Currently experimental and not recommend for production.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'tribe'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install tribe
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+## Copyright
+
+Copyright (c) 2012 Chad Remesch. See LICENSE.txt for further details.

data/Rakefile

@@ -1,134 +1,106 @@
-# encoding: utf-8
+#!/usr/bin/env rake
+require 'bundler/gem_tasks'
+require 'benchmark'
 
-require 'rubygems'
-require 'bundler'
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  $stderr.puts(e.message)
+  $stderr.puts("Run `bundle install` to install missing gems")
   exit e.status_code
 end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "tribe"
-  gem.homepage = "http://github.com/chadrem/tribe"
-  gem.license = "MIT"
-  gem.summary = %Q{Actor Model for Ruby}
-  gem.description = %Q{Actor Model for Ruby.  Can support millions of actors (limited by memory). Currently experimental and not recommended for production.}
-  gem.email = "chad@remesch.com"
-  gem.authors = ["Chad Remesch"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+task :environment do
+  $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
+  require 'tribe'
 end
 
-task :default => :spec
+desc 'Start an IRB console with offier loaded'
+task :console => :environment do
+  require 'irb'
 
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  ARGV.clear
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "tribe #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-begin
-  require 'debugger'
-rescue LoadError
+  IRB.start
 end
 
-require 'tribe'
+desc 'Demo mode (temporary)'
+task :demo => :environment do
+  $demo_queue = Queue.new
+  $demo_mutex = Mutex.new
 
-#
-# TODO: Temporary benchmarking/demo code.
-#
-
-require 'benchmark'
-
-$demo_queue = Queue.new
+  def locked_puts(msg)
+    $demo_mutex.synchronize { puts msg }
+  end
 
-DEMO_ACTOR_COUNT = 100
-DEMO_MSG_COUNT = 3000
+  DEMO_ACTOR_COUNT = 100
+  DEMO_MSG_COUNT = 3000
 
-class MyActor < Tribe::Actor
+  class MyActor < Tribe::Actor
 
-  def pre_init
-    reset_count
-  end
+    def pre_init
+      reset_count
+    end 
 
-  def increment
-    @count += 1
+    def increment
+      @count += 1
 
-    if @count >= DEMO_MSG_COUNT
-      puts "#{@name} done."
-      $demo_queue.push(@name)
+      if @count >= DEMO_MSG_COUNT
+        locked_puts("#{@name} done.")
+        $demo_queue.push(@name)
+      end
     end
-  end
 
-  def reset_count
-    @count = 0
-  end
+    def reset_count
+      @count = 0
+    end
 
-  def go(friend_name)
-    friend = Tribe.registry[friend_name]
+    def go(friend_name)
+      friend = Tribe.registry[friend_name]
 
-    DEMO_MSG_COUNT.times do
-      friend.increment!
+      DEMO_MSG_COUNT.times do
+        friend.increment!
+      end
     end
   end
-end
 
-def tribe_demo
-  actors = []
+  def tribe_demo
+    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
+    locked_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)
+      locked_puts(name)
+    end
 
-  puts 'Resetting...'
-  actors.each do |actor|
-    actor.reset_count!
-  end
+    locked_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
+    locked_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
+      locked_puts("pair: #{actor.name}, #{friend}")
+      actor.go!(friend)
+    end
 
-  puts 'Benchmark...'
-  result = Benchmark.realtime do
-    DEMO_ACTOR_COUNT.times do
-      $demo_queue.pop
+    locked_puts('Benchmark...')
+    result = Benchmark.realtime do
+      DEMO_ACTOR_COUNT.times do
+        $demo_queue.pop
+      end
     end
-  end
 
-  puts result
+    nil
+  end
 
-  nil
+  tribe_demo
 end
+

data/lib/tribe/actor.rb

@@ -1,61 +1,79 @@
 module Tribe
   class Actor
-    attr_reader :name
+    include Workers::Helpers
 
     def initialize(options = {})
-      run_hook(:pre_init)
-
+      @logger = Workers::LogProxy.new(options[:logger])
+      @dedicated = options[:dedicated] || false
+      @mailbox = options[:mailbox] || Tribe::Mailbox.new
+      @registry = options[:registry] || Tribe.registry
+      @name = options[:name]
+      @pool = @dedicated ? Workers::Pool.new(:size => 1) : (options[:pool] || Workers.pool)
       @alive = true
-      @mailbox = Mailbox.new
-      @name = options[:name].freeze
-
-      Tribe.registry.register(self)
 
-      run_hook(:post_init)
+      @registry.register(self)
     end
 
-    def method_missing(method, *args, &block)
-      m = method.to_s
-      bang = m[-1] == '!'
+    def enqueue(command, data = nil)
+      return false unless @alive
 
-      if bang && respond_to?(m.chop!)
-        tell(m, *args)
-      else
-        super
+      @mailbox.push(Workers::Event.new(command, data))
+
+      @pool.perform do
+        process_events
       end
-    end
 
-    def tell(method, *args)
-      message = { :method => method, :args => args }
-      @mailbox.deliver(message)
+      return true
+    end
 
-      Tribe.dispatcher.send(:schedule) do
-        process
+    def alive?
+      @mailbox.synchronize do
+        return @alive
       end
+    end
+
+    def name
+      return @name
+    end
 
-      true
+    def identifier
+      return @name ? "#{object_id}:#{@name}" : object_id
     end
 
     private
-    def process
-      @mailbox.retrieve_each do |message|
-        begin
-          send(message[:method], *message[:args])
-          true
-        rescue Exception => e
-          puts "Actor died while processing: #{e.message}\n#{e.backtrace.join("\n")}"
-          false
+
+    def process_events
+      while (event = @mailbox.shift)
+        case event.command
+        when :shutdown
+          shutdown_handler(event)
+          @pool.shutdown if @dedicated
+          @mailbox.synchronize do
+            @alive = false
+          end
+        else
+          process_event(event)
         end
       end
+    rescue Exception => e
+      @alive = false
+      exception_handler(e)
     end
 
-    def terminate
-      @alive = false
-      Tribe.registry.unregister(self)
+    #
+    # Subclass and override the below methods.
+    #
+
+    def process_event(event)
+      puts "Actor (#{identifier}) received event (#{event.inspect})."
+    end
+
+    def exception_handler(e)
+      puts concat_e("Actor (#{identifier}) died.", e)
     end
 
-    def run_hook(hook)
-      send(hook) if respond_to?(hook, true)
+    def shutdown_handler(event)
+      puts "Actor (#{identifier}) is shutting down."
     end
   end
 end

data/lib/tribe/dedicated_actor.rb

@@ -0,0 +1,9 @@
+module Tribe
+  class DedicatedActor < Tribe::Actor
+    def initialize(options = {})
+      options[:dedicated] = true
+
+      super(options)
+    end
+  end
+end

data/lib/tribe/mailbox.rb

@@ -1,39 +1,26 @@
 module Tribe
   class Mailbox
-    RETRIEVE_CAP = -1 # Disable's the cap by default.
-
-    def initialize
-      @messages = Queue.new
-      @retrieve_lock = Mutex.new
+    def initialize(options = {})
+      @messages = []
+      @mutex = 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
+    def push(event)
+      @mutex.synchronize do
+        @messages.push(event)
+      end
+    end
 
-        return true
+    def shift
+      @mutex.synchronize do
+        @messages.shift
       end
     end
 
-    def deliver(message)
-      @messages.push(message)
-      true
+    def synchronize(&block)
+      @mutex.synchronize do
+        block.call
+      end
     end
   end
 end

data/lib/tribe/registry.rb

@@ -1,44 +1,45 @@
 module Tribe
   class Registry
     def initialize
-      @lock = Mutex.new
-
-      @actors_by_oid = {}
+      @mutex = Mutex.new
       @actors_by_name = {}
     end
 
     def register(actor)
-      @lock.synchronize do
-        @actors_by_oid[actor.object_id] = actor
-
-        if actor.name
-          if @actors_by_name[actor.name]
-            raise "Actor already exists. name=#{actor.name}"
-          else
-            @actors_by_name[actor.name] = actor
-          end
+      @mutex.synchronize do
+        return false unless actor.name
+
+        if @actors_by_name[actor.name]
+          raise "Actor already exists (#{actor.name})."
+        else
+          @actors_by_name[actor.name] = actor
         end
-      end
 
-      true
+        return true
+      end
     end
 
     def unregister(actor)
-      @lock.synchronize do
-        @actors_by_oid.delete(actor.object_id)
+      @mutex.synchronize do
+        return false unless actor.name
+        return false unless @actors_by_name[actor.name]
 
-        if actor.name
-          @actors_by_name.delete(actor.name)
-        end
-      end
+        @actors_by_name.delete(actor.name)
 
-      true
+        return true
+      end
     end
 
     def [](val)
-      @lock.synchronize do
+      @mutex.synchronize do
         return @actors_by_name[val]
       end
     end
+
+    def dispose
+      @mutex.synchronize do
+        @actors_by_name.clear
+      end
+    end
   end
 end

data/lib/tribe/version.rb

@@ -0,0 +1,3 @@
+module Tribe
+  VERSION = '0.0.4'
+end

data/lib/tribe.rb

@@ -1,31 +1,20 @@
-require 'singleton'
-require 'thread'
-require 'set'
+require 'workers'
 
+require 'tribe/mailbox'
 require 'tribe/actor'
-require 'tribe/worker'
-require 'tribe/dispatcher'
+require 'tribe/dedicated_actor'
 require 'tribe/registry'
-require 'tribe/scheduler'
-require 'tribe/timer'
-require 'tribe/message'
-require 'tribe/mailbox'
-require 'tribe/thread_pool'
 
 module Tribe
-  def self.dispatcher
-    @dispatcher ||= Tribe::Dispatcher.new
-  end
-
   def self.registry
-    @registry ||= Tribe::Registry.new
-  end
+    return @registry ||= Tribe::Registry.new
+  end 
 
-  def self.scheduler
-    @scheduler ||= Tribe::Scheduler.new
-  end
+  def self.registry=(val)
+    @registry.dispose if @registry
+    @registry = val 
+  end 
 end
 
-Tribe.dispatcher
+# Force initialization of defaults.
 Tribe.registry
-Tribe.scheduler