celluloid 0.0.3 → 0.1.0

data/lib/celluloid/mailbox.rb

@@ -11,71 +11,65 @@ module Celluloid
     def initialize
       @messages = []
       @lock  = Mutex.new
-      @waker = Waker.new
+      @condition = ConditionVariable.new
+      @dead = false
     end
     
     # Add a message to the Mailbox
     def <<(message)
       @lock.synchronize do
+        raise MailboxError, "dead recipient" if @dead
+        
         @messages << message
-        @waker.signal
+        @condition.signal
       end
       nil
-    rescue WakerError
-      raise MailboxError, "dead recipient"
     end
     
     # Add a high-priority system event to the Mailbox
     def system_event(event)
       @lock.synchronize do
-        @messages.unshift event
-        
-        begin
-          @waker.signal
-        rescue WakerError
-          # Silently fail if messages are sent to dead actors
+        unless @dead # Silently fail if messages are sent to dead actors
+          @messages.unshift event
+          @condition.signal
         end
       end
       nil
     end
     
     # Receive a message from the Mailbox
-    def receive(&block)
+    def receive
       message = nil
       
-      begin
-        @waker.wait
-        message = locate(&block)
-        raise message if message.is_a?(Celluloid::SystemEvent)
-      end while message.nil?
-        
-      message
-    rescue Celluloid::WakerError
-      cleanup # force cleanup of the mailbox
-      raise MailboxError, "mailbox cleanup called during receive"
-    end
-    
-    # Locate and remove a message from the mailbox which matches the given filter
-    def locate
       @lock.synchronize do
-        if block_given?
-          index = @messages.index do |msg|
-            yield(msg) || msg.is_a?(Celluloid::SystemEvent)
-          end
+        raise MailboxError, "attempted to receive from a dead mailbox" if @dead
         
-          @messages.slice!(index, 1).first if index
-        else
-          @messages.shift
-        end
+        begin
+          if block_given?
+            index = @messages.index do |msg|
+              yield(msg) || msg.is_a?(Celluloid::SystemEvent)
+            end
+
+            message = @messages.slice!(index, 1).first if index
+          else
+            message = @messages.shift
+          end
+          
+          raise message if message.is_a?(Celluloid::SystemEvent)
+          
+          @condition.wait(@lock) unless message
+        end until message
       end
+        
+      message
     end
     
-    # Cleanup any IO objects this Mailbox may be using
-    def cleanup
+    # Shut down this mailbox and clean up its contents
+    def shutdown
       @lock.synchronize do
-        @waker.cleanup
         @messages.each { |msg| msg.cleanup if msg.respond_to? :cleanup }
         @messages.clear
+        @dead = true
       end
     end
     
@@ -91,7 +85,7 @@ module Celluloid
     
     # Inspect the contents of the Mailbox
     def inspect
-      "#<Celluloid::Mailbox[#{map { |m| m.inspect }.join(', ')}]>"
+      "#<Celluloid::Mailbox:#{object_id} [#{map { |m| m.inspect }.join(', ')}]>"
     end
   end
 end

data/lib/celluloid/mailbox.rbc

@@ -0,0 +1,1843 @@
+!RBIX
+3578385345186687227
+18
+M
+1
+n
+n
+x
+10
+__script__
+i
+37
+5
+7
+0
+64
+47
+49
+1
+1
+15
+99
+7
+2
+65
+49
+3
+2
+13
+99
+12
+7
+4
+12
+7
+5
+12
+65
+12
+49
+6
+4
+15
+49
+4
+0
+15
+2
+11
+I
+6
+I
+0
+I
+0
+I
+0
+I
+0
+n
+p
+7
+s
+6
+thread
+x
+7
+require
+x
+9
+Celluloid
+x
+11
+open_module
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+9
+Celluloid
+i
+42
+5
+66
+99
+7
+0
+45
+1
+2
+65
+49
+3
+3
+15
+1
+15
+99
+7
+4
+1
+65
+49
+3
+3
+13
+99
+12
+7
+5
+12
+7
+6
+12
+65
+12
+49
+7
+4
+15
+49
+5
+0
+11
+I
+6
+I
+0
+I
+0
+I
+0
+I
+0
+n
+p
+8
+x
+12
+MailboxError
+x
+13
+StandardError
+n
+x
+10
+open_class
+x
+7
+Mailbox
+x
+14
+__class_init__
+M
+1
+n
+n
+x
+7
+Mailbox
+i
+123
+5
+66
+5
+45
+0
+1
+47
+49
+2
+1
+15
+99
+7
+3
+7
+4
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+7
+7
+8
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+9
+7
+10
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+11
+7
+12
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+13
+7
+14
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+15
+7
+16
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+17
+7
+18
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+19
+7
+20
+65
+67
+49
+5
+0
+49
+6
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+I
+0
+n
+p
+21
+x
+10
+Enumerable
+n
+x
+7
+include
+x
+10
+initialize
+M
+1
+n
+n
+x
+10
+initialize
+i
+63
+35
+0
+38
+0
+15
+45
+1
+2
+13
+71
+3
+47
+9
+26
+47
+49
+4
+0
+13
+47
+49
+5
+0
+15
+8
+29
+49
+3
+0
+38
+6
+15
+45
+7
+8
+13
+71
+3
+47
+9
+53
+47
+49
+4
+0
+13
+47
+49
+5
+0
+15
+8
+56
+49
+3
+0
+38
+9
+15
+3
+38
+10
+11
+I
+2
+I
+0
+I
+0
+I
+0
+I
+0
+n
+p
+11
+x
+9
+@messages
+x
+5
+Mutex
+n
+x
+3
+new
+x
+8
+allocate
+x
+10
+initialize
+x
+5
+@lock
+x
+17
+ConditionVariable
+n
+x
+10
+@condition
+x
+5
+@dead
+p
+11
+I
+-1
+I
+b
+I
+0
+I
+c
+I
+5
+I
+d
+I
+20
+I
+e
+I
+3b
+I
+f
+I
+3f
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+0
+x
+17
+method_visibility
+x
+15
+add_defn_method
+x
+2
+<<
+M
+1
+n
+n
+x
+2
+<<
+i
+10
+39
+0
+56
+1
+50
+2
+0
+15
+1
+11
+I
+3
+I
+1
+I
+1
+I
+0
+I
+1
+n
+p
+3
+x
+5
+@lock
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+2
+<<
+i
+34
+39
+0
+9
+17
+5
+45
+1
+2
+7
+3
+64
+47
+49
+4
+2
+8
+18
+1
+15
+39
+5
+21
+1
+0
+49
+6
+1
+15
+39
+7
+49
+8
+0
+11
+I
+4
+I
+0
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+9
+x
+5
+@dead
+x
+12
+MailboxError
+n
+s
+14
+dead recipient
+x
+5
+raise
+x
+9
+@messages
+x
+2
+<<
+x
+10
+@condition
+x
+6
+signal
+p
+9
+I
+0
+I
+15
+I
+12
+I
+0
+I
+13
+I
+17
+I
+1c
+I
+18
+I
+22
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+0
+x
+11
+synchronize
+p
+7
+I
+-1
+I
+13
+I
+0
+I
+14
+I
+8
+I
+1a
+I
+a
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+1
+x
+7
+message
+x
+12
+system_event
+M
+1
+n
+n
+x
+12
+system_event
+i
+10
+39
+0
+56
+1
+50
+2
+0
+15
+1
+11
+I
+3
+I
+1
+I
+1
+I
+0
+I
+1
+n
+p
+3
+x
+5
+@lock
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+12
+system_event
+i
+22
+39
+0
+9
+7
+1
+8
+21
+39
+1
+21
+1
+0
+49
+2
+1
+15
+39
+3
+49
+4
+0
+11
+I
+3
+I
+0
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+5
+x
+5
+@dead
+x
+9
+@messages
+x
+7
+unshift
+x
+10
+@condition
+x
+6
+signal
+p
+9
+I
+0
+I
+20
+I
+7
+I
+21
+I
+10
+I
+22
+I
+15
+I
+0
+I
+16
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+0
+x
+11
+synchronize
+p
+7
+I
+-1
+I
+1e
+I
+0
+I
+1f
+I
+8
+I
+25
+I
+a
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+1
+x
+5
+event
+x
+7
+receive
+M
+1
+n
+n
+x
+7
+receive
+i
+15
+1
+19
+0
+15
+39
+0
+56
+1
+50
+2
+0
+15
+20
+0
+11
+I
+3
+I
+1
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+5
+@lock
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+7
+receive
+i
+115
+39
+0
+9
+17
+5
+45
+1
+2
+7
+3
+64
+47
+49
+4
+2
+8
+18
+1
+15
+94
+9
+55
+39
+5
+56
+6
+50
+7
+0
+19
+0
+15
+20
+0
+9
+52
+39
+5
+20
+0
+79
+49
+8
+2
+49
+9
+0
+22
+1
+0
+8
+53
+1
+8
+63
+39
+5
+49
+10
+0
+22
+1
+0
+15
+21
+1
+0
+45
+11
+12
+43
+13
+49
+14
+1
+9
+87
+5
+21
+1
+0
+47
+49
+4
+1
+8
+88
+1
+15
+21
+1
+0
+9
+97
+1
+8
+104
+39
+15
+39
+16
+49
+17
+1
+15
+68
+21
+1
+0
+10
+113
+8
+19
+1
+11
+I
+5
+I
+1
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+18
+x
+5
+@dead
+x
+12
+MailboxError
+n
+s
+40
+attempted to receive from a dead mailbox
+x
+5
+raise
+x
+9
+@messages
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+7
+receive
+i
+23
+57
+19
+0
+15
+20
+0
+60
+1
+13
+10
+22
+15
+20
+0
+45
+0
+1
+43
+2
+49
+3
+1
+11
+I
+4
+I
+1
+I
+1
+I
+0
+I
+1
+n
+p
+4
+x
+9
+Celluloid
+n
+x
+11
+SystemEvent
+x
+5
+is_a?
+p
+5
+I
+0
+I
+31
+I
+4
+I
+32
+I
+17
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+1
+x
+3
+msg
+x
+5
+index
+x
+6
+slice!
+x
+5
+first
+x
+5
+shift
+x
+9
+Celluloid
+n
+x
+11
+SystemEvent
+x
+5
+is_a?
+x
+10
+@condition
+x
+5
+@lock
+x
+4
+wait
+p
+29
+I
+0
+I
+2d
+I
+12
+I
+0
+I
+13
+I
+30
+I
+16
+I
+31
+I
+20
+I
+35
+I
+35
+I
+0
+I
+37
+I
+37
+I
+3f
+I
+0
+I
+40
+I
+3a
+I
+58
+I
+0
+I
+59
+I
+3c
+I
+68
+I
+0
+I
+6a
+I
+3d
+I
+71
+I
+0
+I
+73
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+1
+x
+5
+index
+x
+11
+synchronize
+p
+9
+I
+-1
+I
+29
+I
+0
+I
+2a
+I
+4
+I
+2c
+I
+c
+I
+40
+I
+f
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+1
+x
+7
+message
+x
+8
+shutdown
+M
+1
+n
+n
+x
+8
+shutdown
+i
+8
+39
+0
+56
+1
+50
+2
+0
+11
+I
+2
+I
+0
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+5
+@lock
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+8
+shutdown
+i
+18
+39
+0
+56
+1
+50
+2
+0
+15
+39
+0
+49
+3
+0
+15
+2
+38
+4
+11
+I
+3
+I
+0
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+5
+x
+9
+@messages
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+8
+shutdown
+i
+22
+57
+19
+0
+15
+20
+0
+7
+0
+49
+1
+1
+9
+20
+20
+0
+49
+0
+0
+8
+21
+1
+11
+I
+4
+I
+1
+I
+1
+I
+0
+I
+1
+n
+p
+2
+x
+7
+cleanup
+x
+11
+respond_to?
+p
+5
+I
+0
+I
+46
+I
+15
+I
+0
+I
+16
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+1
+x
+3
+msg
+x
+4
+each
+x
+5
+clear
+x
+5
+@dead
+p
+7
+I
+0
+I
+46
+I
+8
+I
+47
+I
+e
+I
+48
+I
+12
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+0
+x
+11
+synchronize
+p
+5
+I
+-1
+I
+44
+I
+0
+I
+45
+I
+8
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+0
+x
+4
+to_a
+M
+1
+n
+n
+x
+4
+to_a
+i
+8
+39
+0
+56
+1
+50
+2
+0
+11
+I
+2
+I
+0
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+5
+@lock
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+4
+to_a
+i
+6
+39
+0
+49
+1
+0
+11
+I
+2
+I
+0
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+2
+x
+9
+@messages
+x
+3
+dup
+p
+3
+I
+0
+I
+4e
+I
+6
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+0
+x
+11
+synchronize
+p
+5
+I
+-1
+I
+4d
+I
+0
+I
+4e
+I
+8
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+0
+x
+4
+each
+M
+1
+n
+n
+x
+4
+each
+i
+24
+95
+19
+0
+15
+5
+48
+0
+20
+0
+13
+70
+10
+20
+44
+43
+1
+12
+49
+2
+1
+50
+3
+0
+11
+I
+4
+I
+1
+I
+0
+I
+0
+I
+0
+n
+p
+4
+x
+4
+to_a
+x
+4
+Proc
+x
+14
+__from_block__
+x
+4
+each
+p
+5
+I
+-1
+I
+52
+I
+4
+I
+53
+I
+18
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+1
+x
+5
+block
+x
+7
+inspect
+M
+1
+n
+n
+x
+7
+inspect
+i
+31
+7
+0
+5
+48
+1
+47
+101
+2
+7
+3
+5
+56
+4
+47
+50
+5
+0
+7
+6
+64
+49
+7
+1
+47
+101
+2
+7
+8
+63
+5
+11
+I
+5
+I
+0
+I
+0
+I
+0
+I
+0
+n
+p
+9
+s
+21
+#<Celluloid::Mailbox:
+x
+9
+object_id
+x
+4
+to_s
+s
+2
+ [
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+7
+inspect
+i
+10
+57
+19
+0
+15
+20
+0
+49
+0
+0
+11
+I
+3
+I
+1
+I
+1
+I
+0
+I
+1
+n
+p
+1
+x
+7
+inspect
+p
+3
+I
+0
+I
+58
+I
+a
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+1
+x
+1
+m
+x
+3
+map
+s
+2
+, 
+x
+4
+join
+s
+2
+]>
+p
+5
+I
+-1
+I
+57
+I
+0
+I
+58
+I
+1f
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+0
+p
+19
+I
+2
+I
+9
+I
+b
+I
+b
+I
+19
+I
+13
+I
+27
+I
+1e
+I
+35
+I
+29
+I
+43
+I
+44
+I
+51
+I
+4d
+I
+5f
+I
+52
+I
+6d
+I
+57
+I
+7b
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+0
+x
+13
+attach_method
+p
+5
+I
+2
+I
+4
+I
+f
+I
+8
+I
+2a
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+0
+x
+13
+attach_method
+p
+5
+I
+0
+I
+1
+I
+9
+I
+3
+I
+25
+x
+50
+/Users/tony/src/celluloid/lib/celluloid/mailbox.rb
+p
+0