parallel_server 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53f28860a0d7d10e6e37f34c79c612b451fb1071
-  data.tar.gz: 73f2343779c6db95c2444fef17b207a883e463ad
+  metadata.gz: 60f22791a70556733877e1abacd86ffc257fafd6
+  data.tar.gz: 66d5e90cdca52f41dc687cd160e54b8fb030f858
 SHA512:
-  metadata.gz: 1f8cada5754f3dd15479e5b9be04dff99d3da70b4bccea3ef3ee848c7e1f3d56c25f86234cac44e9f3147df6cf9fed93d9595ec75515d610c04eae9fa868b64f
-  data.tar.gz: 3df445fb613a4a12e3f145d7e89937e5848c48145d5cfe467345884a748a5d93c8048806bc681410e61a7f25ca4440c32e6a80d2ec9a77dc9c905802bfcecbcf
+  metadata.gz: 0d8e13cf7f83e1581706c0013f03e46cdec97490c9d2a13345fca178212201570d6b7836772555d7b8cb8b6ed1a6051a4f41985fe01d0a066bd5218dcb02a79b
+  data.tar.gz: 27f616dc7eab3d89a42faf45a48f3d2b9596ba43783855d19f8840b18675fa93ff8991961f15b735ec470423a8d3649a06b8c7e38c12e0227d2df711ed6bbeb6

data/lib/parallel_server/prefork.rb

@@ -34,9 +34,9 @@ module ParallelServer
       host, port, opts = parse_args(*args)
       @host, @port, @opts = host, port, opts
       set_variables_from_opts
-      @from_child = {}             # IO => pid
-      @to_child = {}               # pid => IO
-      @child_status = {}           # pid => Hash
+      @from_child = {}             # IO(r) => pid
+      @to_child = {}               # IO(r) => IO(w)
+      @child_status = {}           # IO(r) => Hash
       @children = []               # pid
       @loop = true
     end
@@ -167,18 +167,17 @@ module ParallelServer
       readable, = IO.select(rset, nil, nil, 0.1)
       if readable
         readable.each do |from_child|
-          pid = @from_child[from_child]
           if st = Conversation.recv(from_child)
-            @child_status[pid].update st
+            @child_status[from_child].update st
             if st[:status] == :stop
-              @to_child[pid].close rescue nil
-              @to_child.delete pid
+              @to_child[from_child].close rescue nil
+              @to_child.delete from_child
             end
           else
             @from_child.delete from_child
-            @to_child[pid].close rescue nil
-            @to_child.delete pid
-            @child_status.delete pid
+            @to_child[from_child].close rescue nil
+            @to_child.delete from_child
+            @child_status.delete from_child
             from_child.close
           end
         end
@@ -242,13 +241,15 @@ module ParallelServer
         to_child[1].close
         @on_start.call if @on_start
         Child.new(@sockets, @opts, from_child[1], to_child[0]).start(@block)
+        exit! true
       end
       from_child[1].close
       to_child[0].close
-      @from_child[from_child[0]] = pid
-      @to_child[pid] = to_child[1]
+      r, w = from_child[0], to_child[1]
+      @from_child[r] = pid
+      @to_child[r] = w
+      @child_status[r] = {status: :run, connections: {}}
       @children.push pid
-      @child_status[pid] = {status: :run, connections: {}}
       @on_child_start.call(pid) if @on_child_start
     end
 
@@ -334,7 +335,7 @@ module ParallelServer
             @threads[thr] = addr
           end
           count += 1
-          break if count >= max_use
+          break if max_use > 0 && count >= max_use
         end
       ensure
         @status = :stop
@@ -424,7 +425,8 @@ module ParallelServer
       # @return [nil]
       def accept
         while true
-          readable, = IO.select(@sockets, nil, nil, max_idle)
+          timeout = max_idle > 0 ? max_idle : nil
+          readable, = IO.select(@sockets, nil, nil, timeout)
           return nil unless readable
           r, = readable
           begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_server
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Tomita Masahiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies: []
 description: Parallel TCP Server library. This is easy to make Multi-Process / Multi-Thread
   server