async-container 0.16.1 → 0.16.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efe790ddbf87b5df04f8b9e441b27fda5fb1cb69cc6fa2b800a64d3f6af46f24
-  data.tar.gz: 6500f4e2b6d21d8f78a6f99065c0af795694f003c15f1f265634be36a4c8f229
+  metadata.gz: cffebcdeda8a463f4bd854a2023b6942dfd56f7c0d4985555c5b2fc8ef6b5f93
+  data.tar.gz: a39ea00fceed362028c189a687372d0214b2c1da0b7b88aa16cbd4375d19b75a
 SHA512:
-  metadata.gz: d27b92c0e9333dd121f5f5d65be1249073d1e06e55d018f3d91c0670feb14b8463629783c0fe74c416e8f6df1d08f1c84270a5bc19ec040c68c6778da8bdf02d
-  data.tar.gz: ddb9d010c191f469347a759ff2c90fd8d1cab8fddcb0ab6245357098bb1d576843fd351c767ea1dd9d8302dabe549fef04444e090960e0c9ee3d173ff5cbeed4
+  metadata.gz: b3939f550483a2330876833d50b9e79e604e81ca42160190d15b6bfb9ac213a3b4ee8851fb0f079402ffb32e5c14b29563d6beedc4cdec337d975af2bec15fc9
+  data.tar.gz: 9afebedefb06016327f5f3c88a134dc825cfbd52d1206822d8a430cc7498a6e5a90ebb4996b7157e9388f0c089c2b8135e98f188a57ef71029de190d79b05fa1

data/lib/async/container/controller.rb

@@ -28,9 +28,10 @@ require_relative 'notify'
 
 module Async
 	module Container
-		class ContainerError < Error
+		class InitializationError < Error
 			def initialize(container)
 				super("Could not create container!")
+				
 				@container = container
 			end
 			
@@ -54,7 +55,9 @@ module Async
 				
 				@signals = {}
 				
-				trap(SIGHUP, &self.method(:restart))
+				trap(SIGHUP) do
+					self.restart
+				end
 			end
 			
 			def state_string
@@ -117,7 +120,7 @@ module Async
 				rescue
 					@notify&.error!($!.to_s)
 					
-					raise ContainerError, container
+					raise InitializationError, container
 				end
 				
 				# Wait for all child processes to enter the ready state.
@@ -130,18 +133,21 @@ module Async
 					
 					container.stop
 					
-					raise ContainerError, container
+					raise InitializationError, container
 				end
 				
 				# Make this swap as atomic as possible:
 				old_container = @container
 				@container = container
 				
+				Async.logger.debug(self, "Stopping old container...")
 				old_container&.stop
 				@notify&.ready!
 			rescue
 				# If we are leaving this function with an exception, try to kill the container:
 				container&.stop(false)
+				
+				raise
 			end
 			
 			def reload
@@ -152,7 +158,7 @@ module Async
 				begin
 					self.setup(@container)
 				rescue
-					raise ContainerError, container
+					raise InitializationError, container
 				end
 				
 				# Wait for all child processes to enter the ready state.
@@ -163,7 +169,7 @@ module Async
 				if @container.failed?
 					@notify.error!("Container failed!")
 					
-					raise ContainerError, @container
+					raise InitializationError, @container
 				else
 					@notify&.ready!
 				end
@@ -188,8 +194,8 @@ module Async
 						if handler = @signals[exception.signo]
 							begin
 								handler.call
-							rescue ContainerError => failure
-								Async.logger.error(self) {failure}
+							rescue InitializationError => error
+								Async.logger.error(self) {error}
 							end
 						else
 							raise
@@ -200,9 +206,9 @@ module Async
 				self.stop(true)
 			rescue Terminate
 				self.stop(false)
-			else
-				self.stop(true)
 			ensure
+				self.stop(true)
+				
 				# Restore the interrupt handler:
 				Signal.trap(:INT, interrupt_action)
 				Signal.trap(:TERM, terminate_action)

data/lib/async/container/generic.rb

@@ -30,11 +30,20 @@ require_relative 'statistics'
 
 module Async
 	module Container
+		ASYNC_CONTAINER_PROCESSOR_COUNT = 'ASYNC_CONTAINER_PROCESSOR_COUNT'
+		
+		# The processor count which may be used for the default number of container threads/processes. You can override the value provided by the system by specifying the ASYNC_CONTAINER_PROCESSOR_COUNT environment variable.
 		# @return [Integer] the number of hardware processors which can run threads/processes simultaneously.
-		def self.processor_count
-			Etc.nprocessors
-		rescue
-			2
+		def self.processor_count(env = ENV)
+			count = env.fetch(ASYNC_CONTAINER_PROCESSOR_COUNT) do
+				Etc.nprocessors rescue 1
+			end.to_i
+			
+			if count < 1
+				raise RuntimeError, "Invalid processor count #{count}!"
+			end
+			
+			return count
 		end
 		
 		class Generic
@@ -144,7 +153,7 @@ module Async
 						end
 						
 						if status.success?
-							Async.logger.info(self) {"#{child} #{status}"}
+							Async.logger.info(self) {"#{child} exited with #{status}"}
 						else
 							@statistics.failure!
 							Async.logger.error(self) {status}

data/lib/async/container/group.rb

@@ -69,25 +69,26 @@ module Async
 			end
 			
 			def interrupt
+				Async.logger.debug(self, "Sending interrupt to #{@running.size} running processes...")
 				@running.each_value do |fiber|
 					fiber.resume(Interrupt)
 				end
 			end
 			
 			def terminate
+				Async.logger.debug(self, "Sending terminate to #{@running.size} running processes...")
 				@running.each_value do |fiber|
 					fiber.resume(Terminate)
 				end
 			end
 			
 			def stop(timeout = 1)
-				# Handle legacy `graceful = true` argument:
+				# Use a default timeout if not specified:
+				timeout = 1 if timeout == true
+				
 				if timeout
 					start_time = Async::Clock.now
 					
-					# Use a default timeout if not specified:
-					timeout = 1 if timeout == true
-					
 					self.interrupt
 					
 					while self.any?
@@ -103,14 +104,6 @@ module Async
 					end
 				end
 				
-				# Timeout can also be `graceful = false`:
-				if timeout
-					self.interrupt
-					self.sleep(timeout)
-				end
-				
-				self.wait_for_children(duration)
-				
 				# Terminate all children:
 				self.terminate
 				

data/lib/async/container/hybrid.rb

@@ -33,12 +33,21 @@ module Async
 				threads = (count / forks).ceil
 				
 				forks.times do
-					self.spawn(**options) do
-						container = Threaded::Container.new
+					self.spawn(**options) do |instance|
+						container = Threaded.new
 						
 						container.run(count: threads, **options, &block)
 						
+						container.wait_until_ready
+						instance.ready!
+						
 						container.wait
+					rescue Async::Container::Terminate
+						# Stop it immediately:
+						container.stop(false)
+					ensure
+						# Stop it gracefully (also code path for Interrupt):
+						container.stop
 					end
 				end
 				

data/lib/async/container/notify.rb

@@ -23,6 +23,7 @@
 
 require_relative 'notify/pipe'
 require_relative 'notify/socket'
+require_relative 'notify/console'
 
 module Async
 	module Container
@@ -34,7 +35,8 @@ module Async
 				# Select the best available client:
 				@@client ||= (
 					Pipe.open! ||
-					Socket.open!
+					Socket.open! ||
+					Console.open!
 				)
 			end
 		end

data/{spec/async/container/notify_spec.rb → lib/async/container/notify/console.rb}

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+#
 # Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -20,36 +21,49 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require "async/container/controller"
-require "async/container/notify/server"
+require_relative 'client'
 
-RSpec.describe Async::Container::Notify, if: Async::Container.fork? do
-	let(:server) {described_class::Server.open}
-	let(:notify_socket) {server.path}
-	let(:client) {described_class::Socket.new(notify_socket)}
-	
-	describe '#ready!' do
-		it "should send message" do
-			begin
-				context = server.bind
+require 'console/logger'
+
+module Async
+	module Container
+		module Notify
+			class Console < Client
+				def self.open!(logger = ::Console.logger)
+					self.new(logger)
+				end
+				
+				def initialize(logger)
+					@logger = logger
+				end
 				
-				pid = fork do
-					client.ready!
+				def send(level: :debug, **message)
+					@logger.send(level, self) {message}
 				end
 				
-				messages = []
+				def ready!(**message)
+					send(ready: true, **message)
+				end
+				
+				def restarting!(**message)
+					message[:ready] = false
+					message[:reloading] = true
+					message[:status] ||= "Restarting..."
+					
+					send(**message)
+				end
 				
-				Sync do
-					context.receive do |message, address|
-						messages << message
-						break
-					end
+				def reloading!(**message)
+					message[:ready] = false
+					message[:reloading] = true
+					message[:status] ||= "Reloading..."
+					
+					send(**message)
 				end
 				
-				expect(messages.last).to include(ready: true)
-			ensure
-				context&.close
-				Process.wait(pid) if pid
+				def error!(text, **message)
+					send(status: text, level: :error, **message)
+				end
 			end
 		end
 	end

data/lib/async/container/notify/pipe.rb

@@ -56,9 +56,10 @@ module Async
 						environment[NOTIFY_PIPE] = notify_pipe.to_s
 					
 					# Use stdout if it's not redirected:
-					elsif !options.key?(:out)
-						options[:out] = @io
-						environment[NOTIFY_PIPE] = "1"
+					# This can cause issues if the user expects stdout to be connected to a terminal.
+					# elsif !options.key?(:out)
+					# 	options[:out] = @io
+					# 	environment[NOTIFY_PIPE] = "1"
 					
 					# Use fileno 3 if it's available:
 					elsif !options.key?(3)
@@ -82,22 +83,6 @@ module Async
 					send(ready: true, **message)
 				end
 				
-				def restarting!(**message)
-					message[:ready] = false
-					message[:reloading] = true
-					message[:status] ||= "Restarting..."
-					
-					send(**message)
-				end
-				
-				def reloading!(**message)
-					message[:ready] = false
-					message[:reloading] = true
-					message[:status] ||= "Reloading..."
-					
-					send(**message)
-				end
-				
 				private
 				
 				def environment_for(arguments)

data/lib/async/container/notify/server.rb

@@ -98,7 +98,7 @@ module Async
 					
 					def receive
 						while true
-							data, address, flags, *controls = @bound.recvmsg(MAXIMUM_MESSAGE_SIZE)
+							data, _address, _flags, *_controls = @bound.recvmsg(MAXIMUM_MESSAGE_SIZE)
 							
 							message = Server.load(data)
 							

data/lib/async/container/process.rb

@@ -119,13 +119,7 @@ module Async
 			attr :name
 			
 			def to_s
-				if @status
-					"\#<#{self.class} #{@name} -> #{@status}>"
-				elsif @pid
-					"\#<#{self.class} #{@name} -> #{@pid}>"
-				else
-					"\#<#{self.class} #{@name}>"
-				end
+				"\#<#{self.class} #{@name}>"
 			end
 			
 			def close

data/lib/async/container/thread.rb

@@ -21,6 +21,7 @@
 # THE SOFTWARE.
 
 require_relative 'channel'
+require_relative 'error'
 require_relative 'notify/pipe'
 
 require 'async/logger'
@@ -116,7 +117,7 @@ module Async
 			end
 			
 			def name= value
-				@thread.name = name
+				@thread.name = value
 			end
 			
 			def name
@@ -124,11 +125,7 @@ module Async
 			end
 			
 			def to_s
-				if @status
-					"\#<#{self.class} #{@thread.name} -> #{@status}>"
-				else
-					"\#<#{self.class} #{@thread.name}>"
-				end
+				"\#<#{self.class} #{@thread.name}>"
 			end
 			
 			def close

data/lib/async/container/version.rb

@@ -22,6 +22,6 @@
 
 module Async
 	module Container
-		VERSION = "0.16.1"
+		VERSION = "0.16.6"
 	end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: async-container
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.6
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-01 00:00:00.000000000 Z
+date: 2020-06-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: process-group
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: covered
+  name: bake-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: bake-modernize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,35 +108,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "\t\tProvides containers for servers which provide concurrency policies,
-  e.g. threads, processes.\n"
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+description:
 email:
-- samuel.williams@oriontransfer.co.nz
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".github/workflows/development.yml"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- ".yardopts"
-- Gemfile
-- Guardfile
-- README.md
-- Rakefile
-- async-container.gemspec
-- examples/async.rb
-- examples/channel.rb
-- examples/channels/client.rb
-- examples/container.rb
-- examples/isolate.rb
-- examples/minimal.rb
-- examples/test.rb
-- examples/threads.rb
-- examples/title.rb
-- examples/udppipe.rb
 - lib/async/container.rb
 - lib/async/container/best.rb
 - lib/async/container/channel.rb
@@ -163,6 +140,7 @@ files:
 - lib/async/container/keyed.rb
 - lib/async/container/notify.rb
 - lib/async/container/notify/client.rb
+- lib/async/container/notify/console.rb
 - lib/async/container/notify/pipe.rb
 - lib/async/container/notify/server.rb
 - lib/async/container/notify/socket.rb
@@ -171,21 +149,11 @@ files:
 - lib/async/container/thread.rb
 - lib/async/container/threaded.rb
 - lib/async/container/version.rb
-- spec/async/container/controller_spec.rb
-- spec/async/container/forked_spec.rb
-- spec/async/container/hybrid_spec.rb
-- spec/async/container/notify/notify.rb
-- spec/async/container/notify/pipe_spec.rb
-- spec/async/container/notify_spec.rb
-- spec/async/container/shared_examples.rb
-- spec/async/container/threaded_spec.rb
-- spec/async/container_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/socketry/async-container
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -201,17 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
-summary: Async is an asynchronous I/O framework based on nio4r.
-test_files:
-- spec/async/container/controller_spec.rb
-- spec/async/container/forked_spec.rb
-- spec/async/container/hybrid_spec.rb
-- spec/async/container/notify/notify.rb
-- spec/async/container/notify/pipe_spec.rb
-- spec/async/container/notify_spec.rb
-- spec/async/container/shared_examples.rb
-- spec/async/container/threaded_spec.rb
-- spec/async/container_spec.rb
-- spec/spec_helper.rb
+summary: Abstract container-based parallelism using threads and processes where appropriate.
+test_files: []