parallel_server 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5d5502b45b7905a8987e8ca85d33718086a57bc
-  data.tar.gz: 9cba1d1da00b7b52d335b615ff0c54d52a56eb45
+  metadata.gz: 53f28860a0d7d10e6e37f34c79c612b451fb1071
+  data.tar.gz: 73f2343779c6db95c2444fef17b207a883e463ad
 SHA512:
-  metadata.gz: 01383431223dc5812e135947fbb7d98ad5cfefa88009c408e9e51d20a82bb8a7db48cfc81e458918ee65be98b8fa921f65291ef9848d82ec7165d7c553961807
-  data.tar.gz: 42202bdc861f0cc9e95b0acf9d01e38ea81540385d1a39bee34ec657333dd3bada3dcd82f7582d26eff1d4c518a7c6dcb07b3c05146bd29464a11aaad25e7d64
+  metadata.gz: 1f8cada5754f3dd15479e5b9be04dff99d3da70b4bccea3ef3ee848c7e1f3d56c25f86234cac44e9f3147df6cf9fed93d9595ec75515d610c04eae9fa868b64f
+  data.tar.gz: 3df445fb613a4a12e3f145d7e89937e5848c48145d5cfe467345884a748a5d93c8048806bc681410e61a7f25ca4440c32e6a80d2ec9a77dc9c905802bfcecbcf

data/lib/parallel_server/prefork.rb

@@ -38,7 +38,6 @@ module ParallelServer
       @to_child = {}               # pid => IO
       @child_status = {}           # pid => Hash
       @children = []               # pid
-      @thread_to_child = {}        # pid => Thread
       @loop = true
     end
 
@@ -62,8 +61,6 @@ module ParallelServer
       @sockets.each{|s| s.close rescue nil} if @sockets
       @to_child.values.each{|s| s.close rescue nil}
       @to_child.clear
-      @thread_to_child.values.each(&:exit)
-      @thread_to_child.clear
       Timeout.timeout(1){wait_all_children} rescue Thread.new{wait_all_children}
     end
 
@@ -120,24 +117,28 @@ module ParallelServer
     # @param data [String]
     # @return [void]
     def talk_to_children(data)
-      @data_to_child = Marshal.dump(data)
-      @thread_to_child.values.each do |thr|
-        begin
-          thr.run
-        rescue ThreadError
-          # try to run dead thread. ignore it.
-        end
+      data_to_child = Marshal.dump(data)
+      each_nonblock(@to_child.values, 1) do |io|
+        Conversation._send(io, data_to_child) rescue nil
       end
     end
 
-    # @param io [IO]
-    # @return [void]
-    def talk_to_child_loop(io)
-      data = nil
-      while true
-        Thread.stop if data.nil? || data == @data_to_child
-        data = @data_to_child
-        Conversation._send(io, data)
+    # @param values [Array]
+    # @param timeout [Numeric]
+    # @yield [obj]
+    # @yieldparam obj [Object] one of values
+    def each_nonblock(values, timeout)
+      values = values.dup
+      until values.empty?
+        thr = Thread.new do
+          until values.empty? || Thread.current[:exit]
+            value = values.shift
+            break unless value
+            yield value
+          end
+        end
+        thr.join(timeout)
+        thr[:exit] = true
       end
     end
 
@@ -172,15 +173,11 @@ module ParallelServer
             if st[:status] == :stop
               @to_child[pid].close rescue nil
               @to_child.delete pid
-              @thread_to_child[pid].exit rescue nil
-              @thread_to_child.delete pid
             end
           else
             @from_child.delete from_child
             @to_child[pid].close rescue nil
             @to_child.delete pid
-            @thread_to_child[pid].exit rescue nil
-            @thread_to_child.delete pid
             @child_status.delete pid
             from_child.close
           end
@@ -250,7 +247,6 @@ module ParallelServer
       to_child[0].close
       @from_child[from_child[0]] = pid
       @to_child[pid] = to_child[1]
-      @thread_to_child[pid] = Thread.new(to_child[1]){|io| talk_to_child_loop(io)}
       @children.push pid
       @child_status[pid] = {status: :run, connections: {}}
       @on_child_start.call(pid) if @on_child_start
@@ -305,12 +301,12 @@ module ParallelServer
       # @param block [#call]
       # @return [void]
       def start(block)
-        main_thread = Thread.current
-        accept_thread = Thread.new{ accept_loop(block, main_thread) }
-        reload_thread = Thread.new{ reload_loop(main_thread) }
+        queue = Queue.new
+        accept_thread = Thread.new{ accept_loop(block, queue) }
+        reload_thread = Thread.new{ reload_loop(queue) }
 
         # wait that accept_loop or reload_loop end
-        Thread.stop while @status == :run
+        queue.pop
 
         accept_thread.exit
         @sockets.each(&:close)
@@ -324,9 +320,9 @@ module ParallelServer
       private
 
       # @param block [#call]
-      # @param main_thread [Thread]
+      # @param queue [Queue]
       # @return [void]
-      def accept_loop(block, main_thread)
+      def accept_loop(block, queue)
         count = 0
         while @status == :run
           wait_thread
@@ -342,7 +338,7 @@ module ParallelServer
         end
       ensure
         @status = :stop
-        main_thread.run
+        queue.push true
       end
 
       # @return [void]
@@ -353,9 +349,9 @@ module ParallelServer
         @status = :exit
       end
 
-      # @param main_thread [Thread]
+      # @param queue [Queue]
       # @return [void]
-      def reload_loop(main_thread)
+      def reload_loop(queue)
         while true
           data = Conversation.recv(@from_parent)
           break unless data
@@ -368,7 +364,7 @@ module ParallelServer
         @from_parent = nil
       ensure
         @status = :stop
-        main_thread.run
+        queue.push true
       end
 
       # @return [void]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_server
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tomita Masahiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies: []
 description: Parallel TCP Server library. This is easy to make Multi-Process / Multi-Thread
   server
@@ -40,9 +40,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Parallel TCP Server library
 test_files: []
-has_rdoc: true