autorespawn 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 602581acf1fd8576ccb38fe1423d6f26f5eb63cb
-  data.tar.gz: 573418360cf9b7309a0af3dd5113d6abec52e2f9
+  metadata.gz: ff4cfc6c34ead02c1c7d41292c6061978018a914
+  data.tar.gz: 1a549ef5140d9918228595d87e24664a17b43c77
 SHA512:
-  metadata.gz: e2ce49df3632a38fd65306a9f3efe43a940359b490e706958bf690b64ab5e7803c040b7dffab4f8b3735156107622faf9e0b91bb4165d26afb916143e6578dd0
-  data.tar.gz: ae83c99246847d0cbb714160e67798fb358875e399a5ec324e31c216cdd9a3c37b9ea95b8040698828ed13be5c33fcedf29cb2f6dc7dd80f973b10b6972ddcfb
+  metadata.gz: 2e5a7513ff2ba21c63373263e5f1075978cac6266226ec808bf92e3f37227bad5d596d0ea9de3eb34c96ce7ab5fdcc2b7832bd5f998186c27af987817d375dba
+  data.tar.gz: f65c67dc887c0cab8ad812a9398a8b3ba815c1b45187c4efea49e7f035a4a6320d8a7f29600260e7e92e6531a97d88b4107866164a1e56c2790ca6fbc3680636

data/lib/autorespawn/manager.rb

@@ -89,7 +89,8 @@ class Autorespawn
         #
         # (see ProgramID#register_files)
         def register_seed_files(files, search_patch = seed.ruby_load_path, ignore_not_found: true)
-            seed.register_files(files, search_path, ignore_not_found)
+            files = seed.resolve_file_list(files, search_path, ignore_not_found: ignore_not_found)
+            seed.register_files(files)
         end
 
         # Check whether this manager has slaves
@@ -246,18 +247,19 @@ class Autorespawn
             new_slaves = Array.new
 
             trigger_slaves_as_necessary
+            active_slaves.each_value.each(&:write_initial_dump)
 
             while active_slaves.size < parallel_level + 1
                 if slave = queued_slaves.find { |s| !s.running? }
                     queued_slaves.delete(slave)
                 elsif autospawn
-                    needed_slaves, remaining = workers.partition { |s| !s.running? && s.needed? }
+                    needed_slaves, _remaining = workers.partition { |s| !s.running? && s.needed? }
                     failed, normal = needed_slaves.partition { |s| s.finished? && !s.success? }
                     slave = failed.first || normal.first
                 end
 
                 if slave
-                    slave.spawn
+                    slave.spawn(send_initial_dump: false)
                     # We manually track the slave's needed flag, just forcefully
                     # set it to false at that point
                     slave.not_needed!

data/lib/autorespawn/program_id.rb

@@ -1,4 +1,3 @@
-require 'autorespawn/program_id'
 require 'pathname'
 require 'digest/sha1'
 
@@ -8,7 +7,7 @@ class Autorespawn
     # It basically stores information about all the files that form this
     # program.
     class ProgramID
-        FileInfo = Struct.new :require_path, :path, :mtime, :size
+        FileInfo = Struct.new :path, :mtime, :size
 
         # Information about the files that form this program
         #
@@ -58,7 +57,7 @@ class Autorespawn
             loaded_features = $LOADED_FEATURES.map do |file|
                 Pathname.new(file)
             end
-            register_files(loaded_features)
+            register_files(resolve_file_list(loaded_features))
         end
 
         # Resolve a file list into absolute paths
@@ -78,21 +77,31 @@ class Autorespawn
         # @param [Boolean] ignore_not_found whether files that cannot be
         #   resolved are ignored or cause a FileNotFound exception
         # @return [Boolean] whether the program ID has been modified
-        def register_files(files, search_path = ruby_load_path, ignore_not_found: true)
-            modified = Array.new
-            files = resolve_file_list(files, search_path, ignore_not_found: ignore_not_found)
+        def register_files(files, ignore_not_found: true)
             files.find_all do |path|
-                register_file(path, search_path)
+                if path.exist?
+                    register_file(path)
+                elsif ignore_not_found
+                    false
+                else raise FileNotFound, "#{path} cannot be found"
+                end
             end
         end
 
         # Removes any file in self that is not in the given file list and
         # returns the result
-        def slice(files, search_path = ruby_load_path, ignore_not_found: true)
+        def slice(files, ignore_not_found: true)
             result = dup
-            files = resolve_file_list(files, search_path, ignore_not_found: ignore_not_found).
-                to_set
-            result.files.delete_if { |k, _| !files.include?(k) }
+            result.files.delete_if do |k, _|
+                if !files.include?(k)
+                    true
+                elsif !k.exist?
+                    if !ignore_not_found
+                        raise FileNotFound, "#{k} does not exist"
+                    end
+                    true
+                end
+            end
             result
         end
 
@@ -101,8 +110,8 @@ class Autorespawn
         # @param [Pathname] file the path to the file
         # @return [Boolean] whether the registration modified the program ID's
         #   state
-        def register_file(file, search_path = ruby_load_path)
-            info = file_info(file, search_path)
+        def register_file(file)
+            info = file_info(file)
             modified = (files[info.path] != info)
             files[info.path] = info
 
@@ -193,19 +202,16 @@ class Autorespawn
         #
         # @param [Array<Pathname>]
         def ruby_load_path
-            $LOAD_PATH.map { |p| Pathname.new(p) }
+            @ruby_load_path ||= $LOAD_PATH.map { |p| Pathname.new(p) }
         end
 
         # Resolve file information about a single file
         #
-        # @param [Pathname] path the path to the file
-        # @param [Array<Pathname>] search_path the search path to use to resolve
-        #    'path' if it is relative
+        # @param [Pathname] path abolute path to the file
         # @return [FileInfo]
-        def file_info(path, search_path = ruby_load_path)
-            resolved = resolve_file_path(path, search_path)
-            stat = resolved.stat
-            return FileInfo.new(path, resolved, stat.mtime, stat.size)
+        def file_info(path)
+            stat = path.stat
+            return FileInfo.new(path, stat.mtime, stat.size)
         end
     end
 end

data/lib/autorespawn/self.rb

@@ -12,6 +12,9 @@ class Autorespawn
         def spawn
             pid
         end
+        def write_initial_dump
+            true
+        end
         def kill(*, **)
         end
         def join

data/lib/autorespawn/slave.rb

@@ -38,6 +38,15 @@ class Autorespawn
         #
         # @return [String] the result data as received
         attr_reader :result_buffer
+        # @api private
+        #
+        # @return [IO] the IO used to transmit initial information to the slave
+        attr_reader :initial_w
+        # @api private
+        #
+        # @return [String] what is remaining of the initial dump that should be
+        #   passed to the slave
+        attr_reader :initial_dump
 
         # @param [Object] name an arbitrary object that can be used for
         #   reporting / tracking reasons
@@ -71,14 +80,21 @@ class Autorespawn
         # Register files on the program ID
         #
         # (see ProgramID#register_files)
-        def register_files(files, search_path = program_id.ruby_load_path, ignore_not_found: true)
-            program_id.register_files(files, search_path, ignore_not_found: ignore_not_found)
+        def register_files(files)
+            program_id.register_files(files)
         end
 
         # Start the slave
         #
+        # @param [Boolean] send_initial_dump Initial information is sent to the
+        #   slave through the {#initial_w} pipe. This transmission can be done
+        #   asynchronously by setting this flag to true. In this case, the
+        #   caller should make sure that {#write_initial_dump} is called after
+        #   {#spawn} until it returns true. Note that {Manager#poll} takes care
+        #   of this already
+        #
         # @return [Integer] the slave's PID
-        def spawn
+        def spawn(send_initial_dump: true)
             if running?
                 raise AlreadyRunning, "cannot call #spawn on #{self}: already running"
             end
@@ -94,7 +110,14 @@ class Autorespawn
             pid = Kernel.spawn(env, *cmdline, initial_r => initial_r, result_w => result_w, **spawn_options)
             initial_r.close
             result_w.close
-            Marshal.dump([name, program_id], initial_w)
+            @initial_w = initial_w
+            @initial_dump = Marshal.dump([name, program_id])
+            initial_w.write([initial_dump.size].pack("L<"))
+            if send_initial_dump
+                while !write_initial_dump
+                    select([], [initial_w])
+                end
+            end
 
             @pid = pid
             @status = nil
@@ -102,17 +125,33 @@ class Autorespawn
             @result_r = result_r
             pid
 
-        rescue Exception => e
+        rescue Exception
             if pid
                 Process.kill 'TERM', pid
             end
+            initial_w.close if initial_w && !initial_w.closed?
+            initial_r.close if initial_r && !initial_r.closed?
+            result_w.close if result_w && !result_w.closed?
             result_r.close if result_r && !result_r.closed?
             raise
+        end
 
-        ensure
-            initial_r.close if initial_r && !initial_r.closed?
-            initial_w.close if initial_w && !initial_r.closed?
-            result_w.close  if result_w && !result_w.closed?
+        # Write as much of the initial dump to the slave
+        #
+        # To avoid blocking in {#spawn}, the initial dump 
+        def write_initial_dump
+            if !initial_dump.empty?
+                begin
+                    written_bytes = initial_w.write_nonblock(initial_dump)
+                rescue IO::WaitWritable
+                    written_bytes = 0
+                end
+
+                @initial_dump = @initial_dump[written_bytes, initial_dump.size - written_bytes]
+                initial_dump.empty?
+            else
+                true
+            end
         end
 
         # Whether this slave would need to be spawned, either because it has
@@ -214,6 +253,7 @@ class Autorespawn
             end
             @success = @success && status.success?
             result_r.close
+            initial_w.close
             modified
         end
 

data/lib/autorespawn/version.rb

@@ -1,3 +1,3 @@
 class Autorespawn
-    VERSION = "0.5.1"
+    VERSION = "0.6.0"
 end

data/lib/autorespawn.rb

@@ -9,6 +9,7 @@ require "autorespawn/slave"
 require "autorespawn/self"
 require "autorespawn/manager"
 require 'autorespawn/tracked_file'
+require 'tempfile'
 
 # Automatically exec's the current program when one of the source file changes
 #
@@ -55,6 +56,7 @@ class Autorespawn
     def self.initial_program_id
         @initial_program_id
     end
+    @name, @slave_result_fd, @initial_program_id = nil
 
     def self.read_child_state
         # Delete the envvars first, we really don't want them to leak
@@ -63,7 +65,8 @@ class Autorespawn
         if slave_initial_state_fd
             slave_initial_state_fd = Integer(slave_initial_state_fd)
             io = IO.for_fd(slave_initial_state_fd)
-            @name, @initial_program_id = Marshal.load(io)
+            size = io.read(4).unpack('L<').first
+            @name, @initial_program_id = Marshal.load(io.read(size))
             io.close
         end
         if slave_result_fd
@@ -205,10 +208,13 @@ class Autorespawn
     # there
     def dump_initial_state(files)
         program_id = ProgramID.new
+        files = program_id.resolve_file_list(files)
         program_id.register_files(files)
 
         io = Tempfile.new "autorespawn_initial_state"
-        Marshal.dump([name, program_id], io)
+        initial_info = Marshal.dump([name, program_id])
+        io.write([initial_info.size].pack("L<"))
+        io.write(initial_info)
         io.flush
         io.rewind
         io

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autorespawn
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hooks