async 1.27.0 → 1.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d1048beb05a88fed1922f32624f61bf5ed8b1e70c2bd9b0e0c17bfad60aa359
-  data.tar.gz: 0eb19742b401a5ffb95286c766cf68e3159e3b94f57b8fd4272f1038c5dabc00
+  metadata.gz: e7dacbad60b89b492fe3741aa5f61240c8bc1f2d9f23e242c7eadd80cc7d9d38
+  data.tar.gz: a8193d5ec289670c5ca4a795e905ffd660aa57edaac8796e58c3db8b866fa340
 SHA512:
-  metadata.gz: 9c21be88e7a5eea9e6a0380f49eabd47e06522e204b61bb97fc9085053c3e800182a51a83cec001a1bc8533a3f3ff48d1cb1b0987aa15587fbb53ea9209777b6
-  data.tar.gz: 79ed71d369b9bda125239835befe60d2842f33e0cd3ed3b6ebadbf996dccf43cc2605b33119ceaf4ac8bb0e602671efb06665660c20e2702f983cb6a8459208c
+  metadata.gz: de1a9942175a329082d388b280d63c80f614a99145d0df8b6b39e7a4b31d2cb7af4a91bad643f408eeebe6b72807d3f50093528aa5bac273daef67cbb25b3b97
+  data.tar.gz: 206be83fe80c466b12669ad847b041e60f27c21d32f82995e7350385f50d990abe94cfbd701a86717532936d7b6ad1e495df78f45a3c0972e2c70b6647824528

data/lib/async/reactor.rb

@@ -23,6 +23,7 @@
 require_relative 'logger'
 require_relative 'task'
 require_relative 'wrapper'
+require_relative 'scheduler'
 
 require 'nio'
 require 'timers'
@@ -82,8 +83,56 @@ module Async
 			@ready = []
 			@running = []
 			
+			if Scheduler.supported?
+				@scheduler = Scheduler.new(self)
+			else
+				@scheduler = nil
+			end
+			
 			@interrupted = false
 			@guard = Mutex.new
+			@blocked = 0
+			@unblocked = []
+		end
+		
+		attr :scheduler
+		
+		# @reentrant Not thread safe.
+		def block(blocker, timeout)
+			fiber = Fiber.current
+			
+			if timeout
+				timer = self.after(timeout) do
+					if fiber.alive?
+						fiber.resume(false)
+					end
+				end
+			end
+			
+			begin
+				@blocked += 1
+				Fiber.yield
+			ensure
+				@blocked -= 1
+			end
+		ensure
+			timer&.cancel
+		end
+		
+		# @reentrant Thread safe.
+		def unblock(blocker, fiber)
+			@guard.synchronize do
+				@unblocked << fiber
+				@selector.wakeup
+			end
+		end
+		
+		def fiber(&block)
+			if @scheduler
+				Fiber.new(blocking: false, &block)
+			else
+				Fiber.new(&block)
+			end
 		end
 		
 		def logger
@@ -154,7 +203,7 @@ module Async
 		
 		def finished?
 			# TODO I'm not sure if checking `@running.empty?` is really required.
-			super && @ready.empty? && @running.empty?
+			super && @ready.empty? && @running.empty? && @blocked.zero?
 		end
 		
 		# Run one iteration of the event loop.
@@ -174,6 +223,18 @@ module Async
 				@running.clear
 			end
 			
+			unless @blocked.zero?
+				unblocked = Array.new
+				
+				@guard.synchronize do
+					unblocked, @unblocked = @unblocked, unblocked
+				end
+				
+				while fiber = unblocked.pop
+					fiber.resume if fiber.alive?
+				end
+			end
+			
 			if @ready.empty?
 				interval = @timers.wait_interval
 			else
@@ -197,7 +258,7 @@ module Async
 				interval = timeout
 			end
 			
-			# logger.debug(self) {"Selecting with #{@children&.size} children with interval = #{interval ? interval.round(2) : 'infinite'}..."}
+			# logger.info(self) {"Selecting with #{@children&.size} children with interval = #{interval ? interval.round(2) : 'infinite'}..."}
 			if monitors = @selector.select(interval)
 				monitors.each do |monitor|
 					monitor.value.resume
@@ -223,6 +284,8 @@ module Async
 		def run(*arguments, **options, &block)
 			raise RuntimeError, 'Reactor has been closed' if @selector.nil?
 			
+			@scheduler&.set!
+			
 			initial_task = self.async(*arguments, **options, &block) if block_given?
 			
 			while self.run_once
@@ -231,6 +294,7 @@ module Async
 			
 			return initial_task
 		ensure
+			@scheduler&.clear!
 			logger.debug(self) {"Exiting run-loop because #{$! ? $! : 'finished'}."}
 		end
 		

data/lib/async/scheduler.rb

@@ -0,0 +1,112 @@
+# Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'clock'
+
+module Async
+	class Scheduler
+		if Fiber.respond_to?(:set_scheduler)
+			def self.supported?
+				true
+			end
+		else
+			def self.supported?
+				false
+			end
+		end
+		
+		def initialize(reactor)
+			@reactor = reactor
+			@wrappers = nil
+		end
+		
+		def set!
+			@wrappers = {}
+			Fiber.set_scheduler(self)
+		end
+		
+		def clear!
+			# Because these instances are created with `autoclose: false`, this does not close the underlying file descriptor:
+			# @ios&.each_value(&:close)
+			
+			@wrappers = nil
+			Fiber.set_scheduler(nil)
+		end
+		
+		private def from_io(io)
+			@wrappers[io] ||= Wrapper.new(io, @reactor)
+		end
+		
+		def io_wait(io, events, timeout = nil)
+			wrapper = from_io(io)
+			
+			if events == IO::READABLE
+				if wrapper.wait_readable(timeout)
+					return IO::READABLE
+				end
+			elsif events == IO::WRITABLE
+				if wrapper.wait_writable(timeout)
+					return IO::WRITABLE
+				end
+			else
+				if wrapper.wait_any(timeout)
+					return events
+				end
+			end
+			
+			return false
+		ensure
+			wrapper.reactor = nil
+		end
+		
+		# Wait for the specified process ID to exit.
+		# @parameter pid [Integer] The process ID to wait for.
+		# @parameter flags [Integer] A bit-mask of flags suitable for `Process::Status.wait`.
+		# @returns [Process::Status] A process status instance.
+		def process_wait(pid, flags)
+			Thread.new do
+				Process::Status.wait(pid, flags)
+			end.value
+		end
+		
+		def kernel_sleep(duration)
+			@reactor.sleep(duration)
+		end
+		
+		def block(blocker, timeout)
+			@reactor.block(blocker, timeout)
+		end
+		
+		def unblock(blocker, fiber)
+			@reactor.unblock(blocker, fiber)
+		end
+		
+		def close
+		end
+		
+		def fiber(&block)
+			task = Task.new(&block)
+			
+			task.resume
+			
+			return task.fiber
+		end
+	end
+end

data/lib/async/task.rb

@@ -103,7 +103,7 @@ module Async
 		# @attr ios [Reactor] The reactor the task was created within.
 		attr :reactor
 		
-		def_delegators :@reactor, :with_timeout, :timeout, :sleep
+		def_delegators :@reactor, :with_timeout, :sleep
 		
 		# Yield back to the reactor and allow other fibers to execute.
 		def yield

data/lib/async/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module Async
-	VERSION = "1.27.0"
+	VERSION = "1.28.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async
 version: !ruby/object:Gem::Version
-  version: 1.27.0
+  version: 1.28.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-13 00:00:00.000000000 Z
+date: 2020-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console
@@ -153,6 +153,7 @@ files:
 - lib/async/notification.rb
 - lib/async/queue.rb
 - lib/async/reactor.rb
+- lib/async/scheduler.rb
 - lib/async/semaphore.rb
 - lib/async/task.rb
 - lib/async/version.rb
@@ -178,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A concurrency framework for Ruby.