mailbox 0.2.5 → 0.2.6

data/Rakefile

@@ -1,4 +1,5 @@
 require "rubygems"
+require 'java'
 require "rake/testtask"
 require "rake/rdoctask"
 require "jeweler"

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 2
-:patch: 5
+:patch: 6
 :build: 

data/lib/mailbox.rb

@@ -8,6 +8,7 @@
 # the <tt>:channel</tt> parameter on +mailslot+.
 
 require 'rubygems'
+require 'java'
 require 'jretlang'
 
 require File.dirname(__FILE__) + '/synchronized'
@@ -51,6 +52,10 @@ module Mailbox
 
   end
 
+  def __queue_depth__
+    __queue_counter__.get
+  end
+
   private
   def self.included(base)
     base.extend(Mailbox::ClassMethods)
@@ -84,6 +89,12 @@ module Mailbox
     fiber
   end
 
+  synchronized
+  def __queue_counter__
+    @__queue_counter__ ||= java.util.concurrent.atomic.AtomicInteger.new 
+  end
+
+  synchronized
   def __fiber__
     @fiber ||= __started_fiber__
   end
@@ -145,6 +156,7 @@ module Mailbox
       define_method method_name do |*args|
 
         self.send(@__verbose_target__, "enqueued #{method_name}") if defined? @__verbose_target__
+        __queue_counter__.get_and_increment
 
         result = nil
         latch = JRL::Concurrent::CountDownLatch.new(1) if replyable
@@ -152,6 +164,7 @@ module Mailbox
         __fiber__.execute do
           begin
             self.send(@__verbose_target__, "dequeued #{method_name}") if defined? @__verbose_target__
+            __queue_counter__.get_and_decrement
             result = self.send(:"__#{method_name}__", *args )
           rescue Exception => ex
             raise if exception_method.nil? || Mailbox.raise_exceptions_immediately

data/mailbox.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mailbox}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Friedman", "Patrick Farley"]
-  s.date = %q{2010-09-21}
+  s.date = %q{2011-04-19}
   s.description = %q{Mailbox is a JRuby module that simplifies concurrency and is backed by JVM threads.}
   s.email = %q{asher.friedman@gmail.com}
   s.extra_rdoc_files = [

data/test/mailbox_test.rb

@@ -1,8 +1,21 @@
 require 'test_helper.rb'
 
+module JRL::Concurrent
+  class Latch
+    def fail_after_sec
+      raise Exception.new("timed out waiting one second for latch countdown - remaining count: #{count}") unless await 1
+    end
+  end
+end
+
 class MailboxTest < Test::Unit::TestCase
   JThread = java.lang.Thread
 
+
+  def jrl_latch count = 1
+    JRL::Concurrent::Latch.new count
+  end
+
   def test_mailslot_causes_execution_on_separate_thread
     klass = Class.new do
       include Mailbox
@@ -15,13 +28,39 @@ class MailboxTest < Test::Unit::TestCase
     end
 
     thread_info = {}
-    latch = Latches::CountDownLatch.new( 1 )
+    latch = jrl_latch
     klass.new.test_method(latch, thread_info)
 
-    assert( latch.await( 1, Latches::TimeUnit::SECONDS ), "Timed out" )
+    latch.fail_after_sec
     assert_not_equal JThread.current_thread.name, thread_info[:name]
   end
 
+  def test_mailbox_supports_concurrent_mailslot_calls_on_new_mailbox_object
+    klass = Class.new do
+      include Mailbox
+
+      attr_reader :failed
+      def initialize; @items = []; @failed = nil; end
+      
+      mailslot :exception => :fail_test
+      def one
+        raise Exception.new('items not empty!') unless @items.empty?
+        @items << 1
+        sleep 0.01
+        raise Exception.new("items not exactly [1]!") unless @items == [1]
+        @items.pop
+        raise Exception.new('items not empty') unless @items.empty?
+      end
+
+      def fail_test e; @failed = e; end
+    end
+    
+    o = klass.new
+    10.times { Thread.new { o.one } }
+
+    assert_nil o.failed
+  end
+
   def test_mailslot_supports_threadpool_based_fibers
     klass = Class.new do
       include Mailbox
@@ -36,10 +75,10 @@ class MailboxTest < Test::Unit::TestCase
     end
 
     thread_info = {}
-    latch = Latches::CountDownLatch.new( 1 )
+    latch = jrl_latch
     klass.new.test_method(latch, thread_info)
 
-    assert( latch.await( 1, Latches::TimeUnit::SECONDS ), "Timed out" )
+    latch.fail_after_sec
     assert_not_equal JThread.current_thread.name, thread_info[:name]
   end
 
@@ -64,10 +103,10 @@ class MailboxTest < Test::Unit::TestCase
       end
     end
 
-    latch = Latches::CountDownLatch.new( 1 )
+    latch = jrl_latch
     clazz = klass.new(latch)
     clazz.test_method
-    assert( latch.await( 1, Latches::TimeUnit::SECONDS ), "Timed out" )
+    latch.fail_after_sec
     assert_equal "test exception", clazz.ex.message
   end
 
@@ -163,13 +202,13 @@ class MailboxTest < Test::Unit::TestCase
     end
 
     thread_info = {}
-    latch = Latches::CountDownLatch.new 1
+    latch = jrl_latch
     a_channel = JRL::Channel.new
 
     klass.new(a_channel)
     a_channel.publish :latch => latch, :thread_info => thread_info
 
-    assert latch.await( 1, Latches::TimeUnit::SECONDS ), "Timed out" 
+    latch.fail_after_sec
     assert_not_equal JThread.current_thread.name, thread_info[:name]
   end
 
@@ -189,7 +228,7 @@ class MailboxTest < Test::Unit::TestCase
     end
 
     thread_info = {}
-    latch = Latches::CountDownLatch.new 1
+    latch = jrl_latch
     request_channel = JRL::Channels::MemoryRequestChannel.new
 
     klass.new(request_channel)
@@ -202,11 +241,11 @@ class MailboxTest < Test::Unit::TestCase
       latch.count_down
     end
 
-    assert latch.await(1, Latches::TimeUnit::SECONDS), "timed out"
+    latch.fail_after_sec
     assert_equal "ya_rly!", response
   end
 
-  def test_should_support_replayble_messages
+  def test_should_support_replyable_messages
   
     klass = Class.new do
       include Mailbox
@@ -254,9 +293,35 @@ class MailboxTest < Test::Unit::TestCase
 
   end
 
-  def test_should_expose_hooks_to_message_enqueue_and_dequeue
+  def test_should_maintain_queue_depth
+    klass = Class.new do
+      include Mailbox
+      include Test::Unit::Assertions
+
+      def initialize latch
+        @latch = latch
+        __fiber__.execute do 
+          latch.fail_after_sec
+        end
+      end
 
+      mailslot 
+      def test_method latch
+        latch.count_down
+      end
+    end
 
+    hold_latch = jrl_latch
+    agent = klass.new hold_latch
+    method_latch = jrl_latch 10
+    10.times { agent.test_method method_latch }
+    assert_equal 10, agent.__queue_depth__
+    hold_latch.count_down
+    method_latch.fail_after_sec
+    assert_equal 0, agent.__queue_depth__
+  end
+
+  def test_should_expose_hooks_to_message_enqueue_and_dequeue
     klass = Class.new do
       include Mailbox
       attr_accessor :msg_info
@@ -279,13 +344,13 @@ class MailboxTest < Test::Unit::TestCase
 
     end
 
-    latch = JRL::Concurrent::Latch.new 2
+    latch = jrl_latch 2
 
     test_agent = klass.new latch
     test_agent.test_method
     test_agent.test_method
 
-    assert latch.await(1), "timed out waiting for test_method to trip latch twice"
+    latch.fail_after_sec
 
     expected = ['enqueued test_method', 'dequeued test_method', 'enqueued test_method', 'dequeued test_method']
     assert_equal expected, test_agent.msg_info
@@ -301,13 +366,14 @@ class MailboxTest < Test::Unit::TestCase
     end
     
     test_agent = klass.new
-    latch = JRL::Concurrent::Latch.new 1
+    latch = jrl_latch
     test_agent.count_down latch
-    assert latch.await(1), "timed out waiting for first latch" 
+
+    latch.fail_after_sec
 
     test_agent.dispose
 
-    latch = JRL::Concurrent::Latch.new 1
+    latch = jrl_latch
     test_agent.count_down latch
     assert !latch.await(1), "latch didn't time out after fiber was disposed"
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 2
-    - 5
-  version: 0.2.5
+    - 6
+  version: 0.2.6
 platform: ruby
 authors: 
   - Joel Friedman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 -05:00
+date: 2011-04-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency