pb_actor 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b680bcef360e5d1e59a276d633ceb22aee7f496
-  data.tar.gz: cd56e2019501bf107915673daf02c4733711d6b4
+  metadata.gz: 769f131d2a68aac7e498d83a94e10698b93baa9b
+  data.tar.gz: 3fa73cbcab4e355beb9ee81c0c930722476797d5
 SHA512:
-  metadata.gz: b984d664769c243b51738419ea67d4363a61716ea6e321403225e80eee72d74c4f012fa540b4d76b37ac44d1c4cef8cd5d33e062580da149be54f933ed8940a2
-  data.tar.gz: 71aed55f5256e8f56544162e812863829b209f5494107927a41d35ed9037e2bcf74295ad1025706d46cf9af588e198609109d767866cffcef10ebdac600d4f6f
+  metadata.gz: 1afb16fa5de4f6e2b504f02391505e3089285b0d32f2ba4a607a0f22b7c2a926fc6be8f7535ad9967ec00af2f2a7901ba14d016257361b5909fd98d115956c5c
+  data.tar.gz: bc702fb0db8595fe9fa424ddda87e92a5987aaf88a62a20a9a3a11ad34122a1fbbedee729a51edc2a4888cee9963a3d5546fa078400f61a1bec30a69874b26fc

data/README.md

@@ -20,6 +20,7 @@ Or install it yourself as:
 
 ```ruby
 require 'pb_actor'
+require 'benchmark'
 
 class Test
   include PbActor
@@ -36,22 +37,36 @@ class Test
   end
 end
 
-f = Test.new
+t = Test.new
 #=> <PbActor::Proxy:0x00000002106448 @origin=#<Test:0x00000002106470>, @pid=23487, @rd=#<IO:fd 7>, @wr=#<IO:fd 10>>
 
-f.alive?
+t.alive?
 #=> true
 
-f.fib(30)
+t.fib(30)
 #=> 1346269
 
-f.async.p_fib(30)
+t.async.p_fib(30)
 #=> nil
 # 1346269
 
-f.terminate
-f.alive?
+t.terminate
+t.alive?
 #=> false
+
+def fib n
+  if n < 2
+    1
+  else
+    fib(n - 1) + fib(n - 2)
+  end
+end
+
+Benchmark.bm do |bm|
+  bm.report{puts (30..35).map{|n| fib(n)}.reduce(:+)}
+  bm.report{puts (30..35).map{|n| Test.new.future.fib(n)}.map(&:value).reduce(:+)}
+end
+#=> Try it youself!
 ```
 
 ## Contributing

data/lib/pb_actor/proxy.rb

@@ -1,23 +1,28 @@
 require 'timeout'
+require 'securerandom'
 
 module PbActor
   class DeadActorError < StandardError
   end
 
-  class BasicProxy
-    module Message
-      class << self
-        def send msg, wr
-          Marshal.dump(msg, wr)
-        rescue Errno::EPIPE => e
-          raise DeadActorError, 'dead actor call'
-        end
+  module Message
+    class << self
+      def send msg, wr
+        Marshal.dump(msg, wr)
+      rescue Errno::EPIPE => e
+        raise DeadActorError, 'dead actor call'
+      end
 
-        def recv rd
-          Marshal.load rd
-        end
+      def recv rd
+        Marshal.load rd
       end
     end
+  end
+
+  class BasicProxy
+    def initialize origin, pid, wr, rd
+      @origin, @pid, @wr, @rd = origin, pid, wr, rd
+    end
 
     def alive?
       begin
@@ -49,12 +54,24 @@ module PbActor
       cr, pw = IO.pipe
       @pid = fork do
         [pr, pw].each &:close
+        @future_values = {}
         loop do
-          type, method, *args = Message.recv cr
+          type, id, method, *args = begin
+                                      Message.recv cr
+                                    rescue EOFError => e
+                                      [:terminate]
+                                    end
           case type
-          when :method_call, :async_method_call
-            value = @origin.public_send method, *args
-            Message.send([:return_value, value], cw) if type == :method_call
+          when :async_method_call
+            @origin.public_send method, *args
+          when :future_method_call
+            @future_values[id] = @origin.public_send method, *args
+          when :future_value_get
+            Message.send(if @future_values.has_key? id
+              [:future_value, @future_values.delete(id)]
+            else
+              [:no_value]
+            end, cw)
           when :terminate
             exit
           else
@@ -69,18 +86,15 @@ module PbActor
 
     def method_missing method, *args, &blk
       super
-      Message.send([:method_call, method, *args], @wr)
-      type, value = Message.recv @rd
-      case type
-      when :return_value
-        value
-      else
-        raise "what happend!? receive #{type}"
-      end
+      future.method_missing(method, *args).value
     end
 
     def async
-      AsyncProxy.new @origin, @pid, @wr
+      AsyncProxy.new @origin, @pid, @wr, @rd
+    end
+
+    def future
+      FutureProxy.new @origin, @pid, @wr, @rd
     end
 
     def terminate
@@ -97,14 +111,39 @@ module PbActor
   end
 
   class AsyncProxy < BasicProxy
-    def initialize origin, pid, wr
-      @origin, @pid, @wr = origin, pid, wr
+    def method_missing method, *args, &blk
+      super
+      Message.send [:async_method_call, nil, method, *args], @wr
+      nil
     end
+  end
 
+  class FutureProxy < BasicProxy
     def method_missing method, *args, &blk
       super
-      Message.send [:async_method_call, method, *args], @wr
-      nil
+      id = SecureRandom.uuid
+      Message.send [:future_method_call, id, method, *args], @wr
+      Future.new id, @wr, @rd
+    end
+  end
+
+  class Future
+    def initialize id, wr, rd
+      @id = id
+      @wr= wr
+      @rd = rd
+    end
+
+    def value
+      loop do
+        Message.send [:future_value_get, @id], @wr
+        type, value = Message.recv @rd
+        if type == :future_value
+          break value
+        else
+          sleep 0.01
+        end
+      end
     end
   end
 end

data/lib/pb_actor/version.rb

@@ -1,3 +1,3 @@
 module PbActor
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/pb_actor_spec.rb

@@ -50,6 +50,13 @@ describe PbActor do
     @test.bar.should == 'bar'
   end
 
+  it 'future call should work' do
+    params = [1, 2, 3]
+    futures = params.map{ |n| @test.future.hello n }
+    futures.each{ |f| f.should.is_a? PbActor::Future }
+    futures.map(&:value).should == params.map{ |n| "hello #{n}"}
+  end
+
   it 'terminate should work' do
     @test.alive?.should == true
     @test.terminate
@@ -69,5 +76,6 @@ describe PbActor do
   it 'to_s should correct' do
     @test.to_s.should == 'PbActor::Proxy(Test)'
     @test.async.to_s.should == 'PbActor::AsyncProxy(Test)'
+    @test.future.to_s.should == 'PbActor::FutureProxy(Test)'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pb_actor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - jjy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler