async-io 1.27.7 → 1.30.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f36b84a41e617dbb5ffd863ecaf7b68761f6cdbc4969052372ef67071e98b85b
-  data.tar.gz: 5c655fceda94aaae5b17166e7c039e60558dee99755875dbaa51e1f58244f2a0
+  metadata.gz: 61a14845c7d079931211e6ac68687686d7be2408f53967980594d13a7e526036
+  data.tar.gz: 6e6b66368d65a53f0ca0a313aab8a6857821d098c2c7316c8dae8d67329fa1c4
 SHA512:
-  metadata.gz: d3fa287b88b45a084bf750cbd5343f02ad0848c0340ba653937933aeec0c980a61e779c6322afcbcb9ada9fd263d92a35fd9b8d5fb5616df3e9d535d06cb6a8b
-  data.tar.gz: ca1ea7afbee6741820cd9b058fc1bcaa2b1b1f89352280a484ca1ae5732fd2447ec71f4b06deb0d5d0d965e80a00bb17c567ea3188a11c1368eaa26c976a66a4
+  metadata.gz: c49e189437e5c89c011323cbc73c24c799d08e479b85fbf513a96f58b5732262085755750474a048e415a43e703bb78f28100f7a87ac7d506b966357d5d20d6a
+  data.tar.gz: b65bfd71f89d9659dc5f30464c820df28a13b14294d7e4cb8ef432cd698b19fc09208a57f3ae2206c4c28db61ddbebfd0a334b9de50d0b89b3f28e621949cc63

data/lib/async/io/host_endpoint.rb

@@ -77,7 +77,7 @@ module Async
 			# @yield [Socket] the bound socket
 			# @return [Array<Socket>] an array of bound sockets
 			def bind(&block)
-				Addrinfo.foreach(*@specification).collect do |address|
+				Addrinfo.foreach(*@specification).map do |address|
 					Socket.bind(address, **@options, &block)
 				end
 			end

data/lib/async/io/ssl_socket.rb

@@ -30,7 +30,7 @@ module Async
 		
 		# Asynchronous TCP socket wrapper.
 		class SSLSocket < Generic
-			wraps OpenSSL::SSL::SSLSocket, :alpn_protocol, :cert, :cipher, :client_ca, :context, :getsockopt, :hostname, :hostname=, :npn_protocol, :peer_cert, :peer_cert_chain, :pending, :post_connection_check, :setsockopt, :session, :session=, :session_reused?, :ssl_version, :state, :sync_close, :sync_close=, :sysclose, :verify_result, :tmp_key
+			wraps OpenSSL::SSL::SSLSocket, :alpn_protocol, :cert, :cipher, :client_ca, :context, :finished_message, :peer_finished_message, :getsockopt, :hostname, :hostname=, :npn_protocol, :peer_cert, :peer_cert_chain, :pending, :post_connection_check, :setsockopt, :session, :session=, :session_reused?, :ssl_version, :state, :sync_close, :sync_close=, :sysclose, :verify_result, :tmp_key
 			
 			wrap_blocking_method :accept, :accept_nonblock
 			wrap_blocking_method :connect, :connect_nonblock

data/lib/async/io/stream.rb

@@ -46,8 +46,9 @@ module Async
 				@io = io
 				@eof = false
 				
-				@deferred = deferred
 				@pending = 0
+				# This field is ignored, but used to mean, try to buffer packets in a single iteration of the reactor.
+				# @deferred = deferred
 				
 				@writing = Async::Semaphore.new(1)
 				
@@ -148,23 +149,19 @@ module Async
 			end
 			
 			# Flushes buffered data to the stream.
-			def flush(deferred: @deferred)
-				if deferred and task = Task.current?
-					# Despite how it looks, this field is not actually directly related to whether or not writes should occur. It's actually used to control the logic of deferred flushing. Therefore, it should NOT be modified outside this method.
-					@pending += 1
+			def flush
+				return if @write_buffer.empty?
+				
+				@writing.acquire do
+					# Flip the write buffer and drain buffer:
+					@write_buffer, @drain_buffer = @drain_buffer, @write_buffer
 					
-					if @pending == 1
-						task.yield
-						
-						begin
-							drain_write_buffer unless @write_buffer.empty?
-						ensure
-							# The write buffer no longer contains pending writes
-							@pending = 0
-						end
+					begin
+						@io.write(@drain_buffer)
+					ensure
+						# If the write operation fails, we still need to clear this buffer, and the data is essentially lost.
+						@drain_buffer.clear
 					end
-				else
-					drain_write_buffer unless @write_buffer.empty?
 				end
 			end
 			
@@ -210,7 +207,7 @@ module Async
 			end
 			
 			def close_write
-				drain_write_buffer unless @write_buffer.empty?
+				flush
 			ensure
 				@io.close_write
 			end
@@ -220,7 +217,7 @@ module Async
 				return if @io.closed?
 				
 				begin
-					drain_write_buffer unless @write_buffer.empty?
+					flush
 				rescue
 					# We really can't do anything here unless we want #close to raise exceptions.
 				ensure
@@ -250,32 +247,6 @@ module Async
 			
 			private
 			
-			# For efficiency purposes, only call this method when the write buffer is not empty.
-			def drain_write_buffer
-				@writing.acquire do
-					Async.logger.debug(self) do |buffer|
-						if @pending > 0
-							buffer.puts "Draining #{@pending} writes (#{@write_buffer.bytesize} bytes)..."
-						else
-							buffer.puts "Draining immediate write (#{@write_buffer.bytesize} bytes)..."
-						end
-						
-						# buffer.puts "@write_buffer = #{@write_buffer.inspect}"
-						# buffer.puts "@drain_buffer = #{@drain_buffer.inspect}"
-					end
-					
-					# Flip the write buffer and drain buffer:
-					@write_buffer, @drain_buffer = @drain_buffer, @write_buffer
-					
-					begin
-						@io.write(@drain_buffer)
-					ensure
-						# If the write operation fails, we still need to clear this buffer, and the data is essentially lost.
-						@drain_buffer.clear
-					end
-				end
-			end
-			
 			# Fills the buffer from the underlying stream.
 			def fill_read_buffer(size = @block_size)
 				# We impose a limit because the underlying `read` system call can fail if we request too much data in one go.
@@ -284,7 +255,7 @@ module Async
 				end
 				
 				# This effectively ties the input and output stream together.
-				drain_write_buffer unless @write_buffer.empty?
+				flush
 				
 				if @read_buffer.empty?
 					if @io.read_nonblock(size, @read_buffer, exception: false)

data/{spec/async/io/socket/udp_spec.rb → lib/async/io/threads.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 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
@@ -20,44 +20,64 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'async/io/udp_socket'
+require_relative 'notification'
 
-RSpec.describe Async::IO::Socket do
-	include_context Async::RSpec::Reactor
-	
-	# Shared port for localhost network tests.
-	let(:server_address) {Async::IO::Address.udp("127.0.0.1", 6778)}
-	let(:data) {"The quick brown fox jumped over the lazy dog."}
-	
-	let!(:server_task) do
-		reactor.async do
-			Async::IO::Socket.bind(server_address) do |server|
-				packet, address = server.recvfrom(512)
-				
-				server.send(packet, 0, address)
+module Async
+	module IO
+		class Threads
+			def initialize(parent: nil)
+				@parent = parent
 			end
-		end
-	end
-	
-	describe 'basic udp server' do
-		it "should echo data back to peer" do
-			reactor.async do
-				Async::IO::Socket.connect(server_address) do |client|
-					client.send(data)
-					response = client.recv(512)
-					
-					expect(response).to be == data
+			
+			if Async::Scheduler.supported?
+				def async(parent: (@parent or Task.current))
+					parent.async do
+						thread = ::Thread.new do
+							yield
+						end
+						
+						thread.join
+					rescue Stop
+						if thread&.alive?
+							thread.raise(Stop)
+						end
+						
+						begin
+							thread.join
+						rescue Stop
+							# Ignore.
+						end
+					end
 				end
-			end
-		end
-		
-		it "should use unconnected socket" do
-			reactor.async do
-				Async::IO::UDPSocket.wrap(server_address.afamily) do |client|
-					client.send(data, 0, server_address)
-					response, address = client.recvfrom(512)
-					
-					expect(response).to be == data
+			else
+				def async(parent: (@parent or Task.current))
+					parent.async do |task|
+						notification = Async::IO::Notification.new
+						
+						thread = ::Thread.new do
+							yield
+						ensure
+							notification.signal
+						end
+						
+						task.annotate "Waiting for thread to finish..."
+						
+						notification.wait
+						
+						thread.value
+					ensure
+						if thread&.alive?
+							thread.raise(Stop)
+							
+							begin
+								thread.join
+							rescue Stop
+								# Ignore.
+							end
+						end
+						
+						notification&.close
+					end
 				end
 			end
 		end

data/lib/async/io/trap.rb

@@ -36,6 +36,10 @@ module Async
 				@mutex = Mutex.new
 			end
 			
+			def to_s
+				"\#<#{self.class} #{@name}>"
+			end
+			
 			# Ignore the trap within the current process. Can be invoked before forking and/or invoking `install!` to assert default behaviour.
 			def ignore!
 				Signal.trap(@name, :IGNORE)
@@ -87,9 +91,10 @@ module Async
 			# Deprecated.
 			alias trap wait
 			
-			def async(parent: Task.current, &block)
-				parent.async do |task|
-					self.trap(task: task, &block)
+			# In order to avoid blocking the reactor, specify `transient: true` as an option.
+			def async(parent: Task.current, **options, &block)
+				parent.async(**options) do |task|
+					self.wait(task: task, &block)
 				end
 			end
 			

data/lib/async/io/version.rb

@@ -22,6 +22,6 @@
 
 module Async
 	module IO
-		VERSION = "1.27.7"
+		VERSION = "1.30.2"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-io
 version: !ruby/object:Gem::Version
-  version: 1.27.7
+  version: 1.30.2
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: async-container
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -39,21 +53,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: async-container
+  name: bake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: covered
+  name: bake-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'
+- !ruby/object:Gem::Dependency
+  name: bake-modernize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -108,36 +136,12 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
-- samuel.williams@oriontransfer.co.nz
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- ".yardopts"
-- Gemfile
-- README.md
-- async-io.gemspec
-- examples/allocations/byteslice.rb
-- examples/allocations/memory.rb
-- examples/allocations/read_chunks.rb
-- examples/chat/client.rb
-- examples/chat/server.rb
-- examples/defer/worker.rb
-- examples/echo/client.rb
-- examples/echo/server.rb
-- examples/issues/broken_ssl.rb
-- examples/issues/pipes.rb
-- examples/millions/client.rb
-- examples/millions/server.rb
-- examples/udp/client.rb
-- examples/udp/server.rb
-- gems/nio4r-2.3.gemfile
 - lib/async/io.rb
 - lib/async/io/address.rb
 - lib/async/io/address_endpoint.rb
@@ -160,86 +164,33 @@ files:
 - lib/async/io/standard.rb
 - lib/async/io/stream.rb
 - lib/async/io/tcp_socket.rb
+- lib/async/io/threads.rb
 - lib/async/io/trap.rb
 - lib/async/io/udp_socket.rb
 - lib/async/io/unix_endpoint.rb
 - lib/async/io/unix_socket.rb
 - lib/async/io/version.rb
-- spec/addrinfo.rb
-- spec/async/io/buffer_spec.rb
-- spec/async/io/c10k_spec.rb
-- spec/async/io/echo_spec.rb
-- spec/async/io/endpoint_spec.rb
-- spec/async/io/generic_examples.rb
-- spec/async/io/generic_spec.rb
-- spec/async/io/notification_spec.rb
-- spec/async/io/protocol/line_spec.rb
-- spec/async/io/shared_endpoint/server_spec.rb
-- spec/async/io/shared_endpoint_spec.rb
-- spec/async/io/socket/tcp_spec.rb
-- spec/async/io/socket/udp_spec.rb
-- spec/async/io/socket_spec.rb
-- spec/async/io/ssl_server_spec.rb
-- spec/async/io/ssl_socket_spec.rb
-- spec/async/io/standard_spec.rb
-- spec/async/io/stream_context.rb
-- spec/async/io/stream_spec.rb
-- spec/async/io/tcp_socket_spec.rb
-- spec/async/io/trap_spec.rb
-- spec/async/io/udp_socket_spec.rb
-- spec/async/io/unix_endpoint_spec.rb
-- spec/async/io/unix_socket_spec.rb
-- spec/async/io/wrap/http_rb_spec.rb
-- spec/async/io/wrap/tcp_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/socketry/async-io
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Provides support for asynchonous TCP, UDP, UNIX and SSL sockets.
-test_files:
-- spec/addrinfo.rb
-- spec/async/io/buffer_spec.rb
-- spec/async/io/c10k_spec.rb
-- spec/async/io/echo_spec.rb
-- spec/async/io/endpoint_spec.rb
-- spec/async/io/generic_examples.rb
-- spec/async/io/generic_spec.rb
-- spec/async/io/notification_spec.rb
-- spec/async/io/protocol/line_spec.rb
-- spec/async/io/shared_endpoint/server_spec.rb
-- spec/async/io/shared_endpoint_spec.rb
-- spec/async/io/socket/tcp_spec.rb
-- spec/async/io/socket/udp_spec.rb
-- spec/async/io/socket_spec.rb
-- spec/async/io/ssl_server_spec.rb
-- spec/async/io/ssl_socket_spec.rb
-- spec/async/io/standard_spec.rb
-- spec/async/io/stream_context.rb
-- spec/async/io/stream_spec.rb
-- spec/async/io/tcp_socket_spec.rb
-- spec/async/io/trap_spec.rb
-- spec/async/io/udp_socket_spec.rb
-- spec/async/io/unix_endpoint_spec.rb
-- spec/async/io/unix_socket_spec.rb
-- spec/async/io/wrap/http_rb_spec.rb
-- spec/async/io/wrap/tcp_spec.rb
-- spec/spec_helper.rb
+test_files: []