celluloid 0.1.0 → 0.2.0

data/lib/celluloid/calls.rbc

@@ -1,5 +1,5 @@
 !RBIX
-3578385345186687227
+3246536075095810518
 18
 M
 1

data/lib/celluloid/core_ext.rbc

@@ -1,5 +1,5 @@
 !RBIX
-3578385345186687227
+3246536075095810518
 18
 M
 1

data/lib/celluloid/events.rbc

@@ -1,5 +1,5 @@
 !RBIX
-3578385345186687227
+3246536075095810518
 18
 M
 1

data/lib/celluloid/future.rb

@@ -1,28 +1,61 @@
+require 'thread'
+
 module Celluloid
+  # Create a new Celluloid::Future object, allowing a block to be computed in
+  # the background and its return value obtained later
   def self.Future(*args, &block)
-    future = Celluloid::Future.spawn(*args, &block)
-    future.run!
-    future
+    Celluloid::Future.new(*args, &block)
   end
   
+  # Celluloid::Future objects allow methods and blocks to run in the
+  # background, their values requested later
   class Future
-    include Celluloid::Actor
-    
     def initialize(*args, &block)
-      @args, @block = args, block
+      @lock = Mutex.new
+      @value_obtained = false
+      
+      @runner = Runner.new(*args, &block)
+      @runner.run!
     end
     
-    def run
-      @called = true
-      @value = @block[*@args]
-    rescue Exception => error
-      @error = error
+    # Obtain the value for this Future
+    def value
+      @lock.synchronize do
+        unless @value_obtained
+          @value = @runner.value
+          @runner.terminate
+          @value_obtained = true
+        end
+        
+        @value
+      end
     end
     
-    def value
-      raise "not run yet" unless @called
-      abort @error if @error
-      @value
+    # Inspect this Celluloid::Future
+    alias_method :inspect, :to_s
+    
+    # Runner is an internal class which executes the given block/method
+    class Runner
+      include Celluloid
+      
+      def initialize(*args, &block)
+        @args, @block = args, block
+      end
+
+      def run
+        @value = @block.call(*@args)
+      rescue Exception => error
+        @error = error
+      ensure
+        @called = true
+        signal :finished
+      end
+
+      def value
+        wait :finished unless @called
+        abort @error if @error
+        @value
+      end
     end
   end
 end

data/lib/celluloid/future.rbc

@@ -1,5 +1,5 @@
 !RBIX
-3578385345186687227
+3246536075095810518
 18
 M
 1
@@ -9,31 +9,40 @@ x
 10
 __script__
 i
-28
-99
+37
+5
 7
 0
-65
+64
+47
 49
 1
+1
+15
+99
+7
+2
+65
+49
+3
 2
 13
 99
 12
 7
-2
+4
 12
 7
-3
+5
 12
 65
 12
 49
-4
+6
 4
 15
 49
-2
+4
 0
 15
 2
@@ -50,7 +59,13 @@ I
 0
 n
 p
-5
+7
+s
+6
+thread
+x
+7
+require
 x
 9
 Celluloid
@@ -133,7 +148,7 @@ x
 6
 Future
 i
-40
+29
 95
 19
 1
@@ -162,22 +177,240 @@ i
 51
 5
 0
-19
+11
+I
+6
+I
 2
+I
+0
+I
+0
+I
+0
+I
+0
+p
+6
+x
+9
+Celluloid
+n
+x
+6
+Future
+x
+4
+Proc
+x
+14
+__from_block__
+x
+3
+new
+p
+5
+I
+-1
+I
+6
+I
+4
+I
+7
+I
+1d
+x
+49
+/Users/tony/src/celluloid/lib/celluloid/future.rb
+p
+2
+x
+4
+args
+x
+5
+block
+x
+13
+attach_method
+x
+10
+open_class
+x
+14
+__class_init__
+M
+1
+n
+n
+x
+6
+Future
+i
+67
+5
+66
+99
+7
+0
+7
+1
+65
+67
+49
+2
+0
+49
+3
+4
 15
-20
+99
+7
+4
+7
+5
+65
+67
+49
 2
+0
+49
+3
+4
+15
+5
+7
+6
+7
+7
+47
 49
+8
+2
+15
+99
+7
+9
+1
+65
+49
+10
+3
+13
+99
+12
+7
+11
+12
+7
+12
+12
+65
+12
+49
+13
+4
+15
+49
+11
+0
+11
+I
 6
+I
+0
+I
+0
+I
+0
+I
 0
+n
+p
+14
+x
+10
+initialize
+M
+1
+n
+n
+x
+10
+initialize
+i
+66
+95
+19
+1
+15
+45
+0
+1
+13
+71
+2
+47
+9
+25
+47
+49
+3
+0
+13
+47
+49
+4
+0
+15
+8
+28
+49
+2
+0
+38
+5
+15
+3
+38
+6
 15
+45
+7
+8
+20
+0
+36
 20
+1
+13
+70
+10
+54
+44
+43
+9
+12
+49
+10
+1
+51
 2
+0
+38
+11
+15
+39
+11
+49
+12
+0
 11
 I
-7
+6
 I
-3
+2
 I
 0
 I
@@ -187,14 +420,30 @@ I
 I
 0
 p
-7
+13
 x
-9
-Celluloid
+5
+Mutex
 n
 x
+3
+new
+x
+8
+allocate
+x
+10
+initialize
+x
+5
+@lock
+x
+15
+@value_obtained
+x
 6
-Future
+Runner
+n
 x
 4
 Proc
@@ -202,48 +451,224 @@ x
 14
 __from_block__
 x
+7
+@runner
+x
+4
+run!
+p
+11
+I
+-1
+I
+d
+I
+4
+I
+e
+I
+1f
+I
+f
+I
+23
+I
+11
+I
+3c
+I
+12
+I
+42
+x
+49
+/Users/tony/src/celluloid/lib/celluloid/future.rb
+p
+2
+x
+4
+args
+x
+5
+block
+x
+17
+method_visibility
+x
+15
+add_defn_method
+x
 5
-spawn
+value
+M
+1
+n
+n
+x
+5
+value
+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
+5
+value
+i
+28
+39
+0
+9
+7
+1
+8
+24
+39
+1
+49
+2
+0
+38
+3
+15
+39
+1
+49
+4
+0
+15
+2
+38
+0
+15
+39
+3
+11
+I
+2
+I
+0
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+5
+x
+15
+@value_obtained
+x
+7
+@runner
+x
+5
+value
+x
+6
+@value
+x
+9
+terminate
+p
+13
+I
+0
+I
+18
+I
+7
+I
+19
+I
+f
+I
+1a
+I
+15
+I
+1b
+I
+18
+I
+0
+I
+19
+I
+1e
+I
+1c
+x
+49
+/Users/tony/src/celluloid/lib/celluloid/future.rb
+p
+0
 x
-4
-run!
+11
+synchronize
 p
-9
+5
 I
 -1
 I
-2
-I
-4
-I
-3
-I
-1f
-I
-4
+16
 I
-25
+0
 I
-5
+17
 I
-28
+8
 x
 49
 /Users/tony/src/celluloid/lib/celluloid/future.rb
 p
-3
+0
+x
+7
+inspect
 x
 4
-args
+to_s
 x
-5
-block
+12
+alias_method
 x
 6
-future
-x
-13
-attach_method
+Runner
 x
 10
 open_class
@@ -256,62 +681,60 @@ n
 n
 x
 6
-Future
+Runner
 i
-55
+53
 5
 66
 5
 45
 0
 1
-43
-2
 47
 49
-3
+2
 1
 15
 99
 7
-4
+3
 7
-5
+4
 65
 67
 49
-6
+5
 0
 49
-7
+6
 4
 15
 99
 7
-8
 7
-9
+7
+8
 65
 67
 49
-6
+5
 0
 49
-7
+6
 4
 15
 99
 7
-10
+9
 7
-11
+10
 65
 67
 49
-6
+5
 0
 49
-7
+6
 4
 11
 I
@@ -326,15 +749,12 @@ I
 0
 n
 p
-12
+11
 x
 9
 Celluloid
 n
 x
-5
-Actor
-x
 7
 include
 x
@@ -392,11 +812,11 @@ p
 I
 -1
 I
-b
+29
 I
 4
 I
-c
+2a
 I
 12
 x
@@ -427,49 +847,52 @@ x
 3
 run
 i
-63
+96
+29
+68
+1
 26
 93
 0
 15
+26
+93
+1
+15
 29
-25
+28
 0
-2
-38
+39
 0
-15
 39
 1
-39
-2
 36
 1
 51
-3
+2
 0
 38
-4
+3
 30
 8
-59
+62
 26
 93
-1
+2
 15
 24
 13
 45
+4
 5
-6
 12
 49
-7
+6
 1
 10
-42
+45
 8
-54
+57
 15
 24
 19
@@ -478,21 +901,51 @@ i
 20
 0
 38
-8
+7
 25
 8
-59
+62
 15
 92
-1
+2
 27
 34
 92
-0
+1
+27
+30
+8
+83
+26
+2
+38
+8
+15
+5
+7
+9
+47
+49
+10
+1
+15
 27
+34
+2
+38
+8
+15
+5
+7
+9
+47
+49
+10
+1
+15
 11
 I
-6
+7
 I
 1
 I
@@ -503,10 +956,7 @@ I
 0
 n
 p
-9
-x
-7
-@called
+11
 x
 6
 @block
@@ -514,8 +964,8 @@ x
 5
 @args
 x
-2
-[]
+4
+call
 x
 6
 @value
@@ -529,46 +979,75 @@ x
 x
 6
 @error
+x
+7
+@called
+x
+8
+finished
+x
+6
+signal
 p
-19
+29
 I
 -1
 I
-f
+2d
 I
 0
 I
-10
+2e
 I
-b
+7
 I
-11
+34
 I
-19
+e
 I
-0
+2e
 I
-1e
+1c
 I
-12
+0
 I
-2b
+21
 I
-14
+2f
 I
-2c
+2e
 I
-12
+31
 I
 2f
 I
-13
+2f
+I
+32
+I
+30
 I
-3b
+3e
 I
 0
 I
-3f
+45
+I
+32
+I
+49
+I
+33
+I
+53
+I
+32
+I
+57
+I
+33
+I
+60
 x
 49
 /Users/tony/src/celluloid/lib/celluloid/future.rb
@@ -588,18 +1067,17 @@ x
 5
 value
 i
-34
+33
 39
 0
 9
 7
 1
 8
-15
+14
 5
 7
 1
-64
 47
 49
 2
@@ -608,7 +1086,7 @@ i
 39
 3
 9
-29
+28
 5
 39
 3
@@ -617,7 +1095,7 @@ i
 4
 1
 8
-30
+29
 1
 15
 39
@@ -639,12 +1117,12 @@ p
 x
 7
 @called
-s
-11
-not run yet
 x
-5
-raise
+8
+finished
+x
+4
+wait
 x
 6
 @error
@@ -659,29 +1137,29 @@ p
 I
 -1
 I
-16
+36
 I
 0
 I
-17
+37
 I
-f
+e
 I
 0
 I
-10
+f
 I
-18
+38
 I
-1e
+1d
 I
 0
 I
-1f
+1e
 I
-19
+39
 I
-22
+21
 x
 49
 /Users/tony/src/celluloid/lib/celluloid/future.rb
@@ -692,21 +1170,49 @@ p
 I
 2
 I
+27
+I
+b
+I
+29
+I
+19
+I
+2d
+I
+27
+I
+36
+I
+35
+x
+49
+/Users/tony/src/celluloid/lib/celluloid/future.rb
+p
+0
+x
+13
+attach_method
+p
 9
 I
+2
+I
 d
 I
-b
+10
 I
-1b
+16
 I
-f
+1e
 I
-29
+23
 I
-16
+28
 I
-37
+26
+I
+43
 x
 49
 /Users/tony/src/celluloid/lib/celluloid/future.rb
@@ -717,11 +1223,11 @@ p
 I
 2
 I
-2
+6
 I
 d
 I
-8
+c
 I
 28
 x
@@ -733,13 +1239,17 @@ x
 13
 attach_method
 p
-3
+5
 I
 0
 I
 1
 I
-1c
+9
+I
+3
+I
+25
 x
 49
 /Users/tony/src/celluloid/lib/celluloid/future.rb