pb_actor 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed926fafad75713c566df0ac82704631c29ecff0
-  data.tar.gz: 7d74986b42da2262ba4dc3a04d3786a47996c2e0
+  metadata.gz: 171981023e291918c5a970e7f33062035e0c8542
+  data.tar.gz: d687fbe4a94c60505e4c765f56067d33f20cd752
 SHA512:
-  metadata.gz: a1268f95cb59df589117fad9822cf02c433c1cd1ffb611ead131377aecaf97def664979f60d2725a61f4f46f9dab17524f44e469912d0e525970eda6bc4b5fc0
-  data.tar.gz: f6d686f57c195f8ab3cd6400163b6905402df5b31b1a1b2f8b42b2af413a943e34b98c018b935e3c942761b7b0608cf42eb790e55560524fd69613a495dfba87
+  metadata.gz: 4222d61838e6118b282efcba9449531d8000b9d79ccc1769b536f4667d5f9965178de18298e673a52679b4930ff4425c6d384eebd0fab49d8db922263fc522fd
+  data.tar.gz: 3014b7618e9cdaab4b9ee3670a3c9d2aab50bddd601ce3fb9df40fe28c3404480a24e61058e9526be26cd2023dfeeecfd417ce463e2f2b8c66f38149a0bec6f7

data/lib/pb_actor.rb

@@ -6,6 +6,10 @@ module PbActor
     def included base
       base.send :extend, ClassMethods
     end
+
+    def dead_actor_msg
+      'dead actor call'
+    end
   end
 
   module ClassMethods

data/lib/pb_actor/basic_proxy.rb

@@ -4,17 +4,22 @@ module PbActor
   class BasicProxy
     def initialize origin, pid, wr, rd
       @origin, @pid, @wr, @rd = origin, pid, wr, rd
+      @alive = true
     end
 
     def alive?
-      !Process.waitpid @pid, Process::WNOHANG
+      if !@alive || (!Process.waitpid @pid, Process::WNOHANG)
+        @alive
+      else
+        @alive = false
+      end
     rescue Errno::ECHILD => e
-      false
+      @alive = false
     end
 
     def method_missing method, *args, &blk
       raise ArgumentError, 'actor not support block' if blk
-      raise DeadActorError, 'dead actor call' unless alive?
+      raise DeadActorError, PbActor.dead_actor_msg unless alive?
     end
 
     def to_s

data/lib/pb_actor/message.rb

@@ -4,13 +4,13 @@ module PbActor
       def send msg, wr
         Marshal.dump(msg, wr)
       rescue Errno::EPIPE => e
-        raise DeadActorError, 'dead actor call'
+        raise DeadActorError, PbActor.dead_actor_msg
       end
 
       def recv rd
         Marshal.load rd
       rescue EOFError => e
-        raise DeadActorError, 'dead actor call'
+        raise DeadActorError, PbActor.dead_actor_msg
       end
     end
   end

data/lib/pb_actor/proxy.rb

@@ -39,6 +39,7 @@ module PbActor
       [cr, cw].each &:close
       @rd = pr
       @wr = pw
+      @alive = true
     end
 
     def method_missing method, *args, &blk
@@ -55,15 +56,21 @@ module PbActor
     end
 
     def terminate
+      raise DeadActorError, PbActor.dead_actor_msg unless alive?
       Message.send [:terminate], @wr
       Process.wait @pid
       nil
+    rescue Errno::ECHILD => e
+      raise DeadActorError, PbActor.dead_actor_msg
     end
 
     def terminate!
+      raise DeadActorError, PbActor.dead_actor_msg unless alive?
       Process.kill "KILL", @pid
       Process.wait @pid
       nil
+    rescue Errno::ECHILD, Errno::ESRCH => e
+      raise DeadActorError, PbActor.dead_actor_msg
     end
   end
 end

data/lib/pb_actor/version.rb

@@ -1,3 +1,3 @@
 module PbActor
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/pb_actor_spec.rb

@@ -62,6 +62,7 @@ describe PbActor do
     @test.terminate
     @test.alive?.should == false
     expect{@test.foo}.to raise_error(PbActor::DeadActorError)
+    expect{@test.terminate}.to raise_error(PbActor::DeadActorError)
   end
 
   it 'terminate! should work' do
@@ -71,6 +72,7 @@ describe PbActor do
       @test.alive? == false
     end
     @test.alive?.should == false
+    expect{@test.terminate!}.to raise_error(PbActor::DeadActorError)
   end
 
   it 'to_s should correct' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pb_actor
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - jjy