async-io 1.27.5 → 1.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aa645f59a002756ee40be3c903917fb8010d91d61f1984a863481cab364644c
-  data.tar.gz: 8e4fc966f387cb76a7635923d4f3803a2cd91354ddf63fc4618431c97c1c89e9
+  metadata.gz: 23f8785195920d67cdc0497fd7cbbc4dd261a34722974eff69e49cab8a9bf070
+  data.tar.gz: 448e9628835ce82210974bb5c7537785022261e9d5468e5e423b48a11898202f
 SHA512:
-  metadata.gz: 297100087ebdf7a49a147b3b29f7e1b1c9cceffcf8c2a68857bb12cf10dfde34e83e5f18c53a1060f2833bb630b17ba72f5532bbd3453e953d5362c30d4eaf2c
-  data.tar.gz: 0dfb45ca2d1134185511c44a91bf2c02e8ded1cb7e31fc10cb71ac2de93444aa45a5dd44a5edb94f224a1b2800c1d63818ae23803a0607137de5a810486fa878
+  metadata.gz: dcbc8e9004a33571775ec58d946d6939ba1a1d9d296a94a1dac4a3d5cce77a2e9bea87154fffe59663f1f59bc8585ee5d3509e77f4257d3dedb7e8372af777d5
+  data.tar.gz: c3849305261631553ebbf4a6d2e92fabdbd7ef9d0c6ae94353efd5ad20e4001d4309cc21b1570194aa0a0028e008f6fe6f8f784038adea9f41d6e050494b700c

data/lib/async/io/generic.rb

@@ -29,7 +29,7 @@ module Async
 		BLOCK_SIZE = ENV.fetch('ASYNC_IO_BLOCK_SIZE', 1024*64).to_i
 		
 		# The maximum read size when appending to IO buffers. Defaults to 8MB.
-		MAXIMUM_READ_SIZE = ENV.fetch('ASYNC_IO_MAXIMUM_READ_SIZE', BLOCK_SIZE * 128 * 8).to_i
+		MAXIMUM_READ_SIZE = ENV.fetch('ASYNC_IO_MAXIMUM_READ_SIZE', BLOCK_SIZE * 128).to_i
 		
 		# Convert a Ruby ::IO object to a wrapped instance:
 		def self.try_convert(io, &block)

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/stream.rb

@@ -46,8 +46,10 @@ 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)
 				
 				# We don't want Ruby to do any IO buffering.
@@ -147,17 +149,19 @@ module Async
 			end
 			
 			# Flushes buffered data to the stream.
-			def flush(deferred: @deferred)
-				if deferred and task = Task.current?
-					@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
-						drain_write_buffer unless @write_buffer.empty?
-						@pending = 0
+					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
 			
@@ -203,7 +207,7 @@ module Async
 			end
 			
 			def close_write
-				drain_write_buffer unless @write_buffer.empty?
+				flush
 			ensure
 				@io.close_write
 			end
@@ -213,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
@@ -243,23 +247,6 @@ module Async
 			
 			private
 			
-			def drain_write_buffer
-				@writing.acquire do
-					Async.logger.debug(self) do
-						if @pending > 0
-							"Draining #{@pending} writes (#{@write_buffer.bytesize} bytes)..."
-						else
-							"Draining immediate write (#{@write_buffer.bytesize} bytes)..."
-						end
-					end
-					
-					@write_buffer, @drain_buffer = @drain_buffer, @write_buffer
-					
-					@io.write(@drain_buffer)
-					@drain_buffer.clear
-				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.
@@ -268,9 +255,7 @@ module Async
 				end
 				
 				# This effectively ties the input and output stream together.
-				if @pending > 0
-					drain_write_buffer
-				end
+				flush
 				
 				if @read_buffer.empty?
 					if @io.read_nonblock(size, @read_buffer, exception: false)
@@ -281,6 +266,7 @@ module Async
 					if chunk = @io.read_nonblock(size, @input_buffer, exception: false)
 						@read_buffer << chunk
 						# Async.logger.debug(self, name: "read") {@read_buffer.inspect}
+						
 						return true
 					end
 				end

data/{spec/async/io/trap_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,33 +20,44 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'async/io/trap'
+require_relative 'notification'
 
-RSpec.describe Async::IO::Trap do
-	include_context Async::RSpec::Reactor
-	
-	subject {described_class.new(:USR2)}
-	
-	it "can ignore signal" do
-		subject.ignore!
-		
-		Process.kill(:USR2, Process.pid)
-	end
-	
-	it "should wait for signal" do
-		trapped = false
-		
-		waiting_task = reactor.async do
-			subject.wait do
-				trapped = true
-				break
+module Async
+	module IO
+		class Threads
+			def initialize(parent: nil)
+				@parent = parent
+			end
+			
+			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
-		
-		subject.trigger
-		
-		waiting_task.wait
-		
-		expect(trapped).to be_truthy
 	end
 end

data/lib/async/io/trap.rb

@@ -87,9 +87,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.5"
+		VERSION = "1.30.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-io
 version: !ruby/object:Gem::Version
-  version: 1.27.5
+  version: 1.30.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-21 00:00:00.000000000 Z
+date: 2020-06-02 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
@@ -109,36 +137,11 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 description: 
-email:
-- samuel.williams@oriontransfer.co.nz
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- ".yardopts"
-- Gemfile
-- README.md
-- Rakefile
-- 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
@@ -161,38 +164,12 @@ 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
@@ -205,7 +182,7 @@ 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:
   - - ">="
@@ -216,31 +193,4 @@ rubygems_version: 3.1.2
 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: []