multi_process 0.5.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 550774b3bb8c3f49060efc3d508f1d55a0c70924
-  data.tar.gz: e8bfbfe219cd440b5c7163db8cf81c8e8c1f0470
+SHA256:
+  metadata.gz: 9f71381653129f6aa7bf31441102ce950a28ce3d39da4bf7b4542ac1401b1ee3
+  data.tar.gz: 98146cfa10d5530f03b11d1d80679417d6820dd2764ec9161751f77bdad309f6
 SHA512:
-  metadata.gz: 098592026b269f5afcee611ab82bc06863eba7795e1f7afd446d314d6f44584e14901518ff9b18e12e1b85a435d9a8238d21ac0471de0f65af10f64fd5851cdf
-  data.tar.gz: 87be05c69577bac776b30dcd4a009029e7591a1d9512771ce885939769340a5e79baf5d1fbc5f2c23d851a80e5c5dbfa35dbdaa4b6cc4ba47bc2f949663b19ce
+  metadata.gz: 331cf8cb96d54d265fecaa6750b9c71d9e11231385d6d778ffde6a664d636478b855e525cbe2d3bd474127308ab615b2f90e8599f80159af01041dae3117506a
+  data.tar.gz: dde0d89ada0985a2188edb4ec9a169d595d609580370c9e1f1f2b818897c7ed9b2c88420b5608f002b281c9c93c45c8d800cba4adcbaeaac652d8cbd01f16938

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## 1.0.0 - 2019-05-13
+### Fixed
+- Possible concurrent hash modification while iterating (#1)
+
+[Unreleased]: https://github.com/jgraichen/multi_process/compare/v1.0.0...HEAD

data/README.md

@@ -39,7 +39,7 @@ group.stop  # Stop processes
 (23314) rubyC | Output from C
 (23311) rubyB | Output from B
 (23308) rubyA | Output from A
-``
+```
 
 ## Contributing
 
@@ -51,7 +51,7 @@ group.stop  # Stop processes
 
 ## License
 
-Copyright (C) 2014  Jan Graichen
+Copyright (C) 2019  Jan Graichen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

data/lib/multi_process.rb

@@ -4,6 +4,7 @@ require 'childprocess'
 module MultiProcess
   DEFAULT_TIMEOUT = 60
 
+  require 'multi_process/loop'
   require 'multi_process/group'
   require 'multi_process/receiver'
   require 'multi_process/nil_receiver'

data/lib/multi_process/logger.rb

@@ -16,6 +16,8 @@ module MultiProcess
       @out   = args[0] || $stdout
       @err   = args[1] || $stderr
 
+      @colwidth = 0
+
       super()
     end
 
@@ -32,6 +34,10 @@ module MultiProcess
       end
     end
 
+    def connected(process, _)
+      @colwidth = [process.title.to_s.length, @colwidth].max
+    end
+
     def read(pipe)
       pipe.gets
     end
@@ -43,26 +49,27 @@ module MultiProcess
     private
 
     def output(process, line, opts = {})
-      @mutex.synchronize do
-        opts[:delimiter]   ||= ' |'
-        name = if opts[:name]
-                 opts[:name].to_s.dup
+      opts[:delimiter]   ||= ' |'
+      name = if opts[:name]
+               opts[:name].to_s.dup
+             else
+               if process
+                 process.title.to_s.rjust(@colwidth, ' ')
                else
-                 max = @readers.values.map { |h| h[:process] ? h[:process].title.length : 0 }.max
-                 process ? process.title.to_s.rjust(max, ' ') : (' ' * max)
-        end
+                 (' ' * @colwidth)
+               end
+             end
 
-        io = opts[:io] || @out
-        if @last_name == name && collapse?
-          io.print " #{' ' * name.length} #{opts[:delimiter]} "
-        else
-          io.print " #{name} #{opts[:delimiter]} "
-        end
-        io.puts line
-        io.flush
-
-        @last_name = name
+      io = opts[:io] || @out
+      if @last_name == name && collapse?
+        io.print " #{' ' * name.length} #{opts[:delimiter]} "
+      else
+        io.print " #{name} #{opts[:delimiter]} "
       end
+      io.puts line
+      io.flush
+
+      @last_name = name
     end
 
     class << self

data/lib/multi_process/loop.rb

@@ -0,0 +1,39 @@
+require 'nio'
+
+module MultiProcess
+  class Loop
+    def initialize
+      @selector = ::NIO::Selector.new
+
+      Thread.new do
+        loop do
+          @selector.select(30.0) do |monitor|
+            if monitor.io.eof?
+              @selector.deregister(monitor.io)
+              monitor.value.call(:eof, monitor)
+            else
+              monitor.value.call(:ready, monitor)
+            end
+          end
+
+          # Wait very short time to allow scheduling another thread
+          sleep(0.001)
+        end
+      end
+    end
+
+    def watch(io, &block)
+      @selector.wakeup
+      @selector.register(io, :r).tap do |monitor|
+        monitor.value = block
+        monitor.value.call(:registered, monitor)
+      end
+    end
+
+    class << self
+      def instance
+        @instance ||= new
+      end
+    end
+  end
+end

data/lib/multi_process/receiver.rb

@@ -3,36 +3,6 @@ module MultiProcess
   # actions on event and output.
   #
   class Receiver
-    # Mutex to synchronize operations.
-    #
-    attr_reader :mutex
-
-    def initialize
-      @mutex   = Mutex.new
-      @readers = {}
-
-      Thread.new do
-        begin
-          loop do
-            io = IO.select(@readers.keys, nil, nil, 0.1)
-            (io.nil? ? [] : io.first).each do |reader|
-              op = @readers[reader]
-
-              if reader.eof?
-                @readers.delete_if { |key, _value| key == reader }
-                removed op[:process], op[:name]
-              else
-                received op[:process], op[:name], read(reader)
-              end
-            end
-          end
-        rescue Exception => ex
-          puts ex.message
-          puts ex.backtrace
-        end
-      end
-    end
-
     # Request a new pipe writer for given process and name.
     #
     # @param process [ Process ] Process requesting pipe.
@@ -41,8 +11,18 @@ module MultiProcess
     #
     def pipe(process, name)
       reader, writer = IO.pipe
-      @readers[reader] = { name: name, process: process }
-      connected process, name
+
+      Loop.instance.watch(reader) do |action, monitor|
+        case action
+        when :registered
+          connected(process, name)
+        when :ready
+          received(process, name, read(monitor.io))
+        when :eof
+          removed(process, name)
+        end
+      end
+
       writer
     end
 

data/lib/multi_process/version.rb

@@ -1,8 +1,8 @@
 module MultiProcess
   module VERSION
-    MAJOR = 0
-    MINOR = 5
-    PATCH = 2
+    MAJOR = 1
+    MINOR = 0
+    PATCH = 0
     STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')
 

data/multi_process.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activesupport', '>= 3.1'
   spec.add_runtime_dependency 'childprocess'
+  spec.add_runtime_dependency 'nio4r', '~> 2.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'bundler'
 end

data/spec/multi_process_spec.rb

@@ -7,17 +7,17 @@ describe MultiProcess do
     logger = MultiProcess::Logger.new writer, collapse: false
     group  = MultiProcess::Group.new receiver: logger
     group << MultiProcess::Process.new(%w(ruby spec/files/test.rb A), title: 'rubyA')
-    group << MultiProcess::Process.new(%w(ruby spec/files/test.rb B), title: 'rubyB')
-    group << MultiProcess::Process.new(%w(ruby spec/files/test.rb C), title: 'rubyC')
+    group << MultiProcess::Process.new(%w(ruby spec/files/test.rb B), title: 'rubyBB')
+    group << MultiProcess::Process.new(%w(ruby spec/files/test.rb C), title: 'rubyCCC')
     group.run
 
-    expect(reader.read_nonblock(4096).split("\n")).to match_array <<-EOF.gsub(/^\s+/, ' ').split("\n")
-    rubyB  | Output from B
-    rubyA  | Output from A
-    rubyA  | Output from A
-    rubyC  | Output from C
-    rubyC  | Output from C
-    rubyB  | Output from B
+    expect(reader.read_nonblock(4096).split("\n")).to match_array <<-EOF.gsub(/^\s+\./, '').split("\n")
+    .  rubyBB  | Output from B
+    .   rubyA  | Output from A
+    .   rubyA  | Output from A
+    . rubyCCC  | Output from C
+    . rubyCCC  | Output from C
+    .  rubyBB  | Output from B
     EOF
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_process
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2019-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,19 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: nio4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Handle multiple child processes.
 email:
 - jg@altimos.de
@@ -60,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -67,6 +82,7 @@ files:
 - lib/multi_process.rb
 - lib/multi_process/group.rb
 - lib/multi_process/logger.rb
+- lib/multi_process/loop.rb
 - lib/multi_process/nil_receiver.rb
 - lib/multi_process/process.rb
 - lib/multi_process/process/bundle_exec.rb
@@ -99,8 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Handle multiple child processes.