async-io 1.26.0 → 1.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c73625346e61dc5ca64794c5fe70343437cf18e2f019a1fb7bba89d76eaaba6
-  data.tar.gz: 3fb2fbe3c6b50642b8ad3650b7829119c7f5b41ee8837569571e01a30364a4cf
+  metadata.gz: 59838b8c517c12bc36a08b4c235ee149c235f4b61bd405f1548cc2a9eedf0e20
+  data.tar.gz: afe198be21f60e75ff8392d8a86c17da15f2144ad5328fd604b5439c0e14fd7e
 SHA512:
-  metadata.gz: aca0fe4641f3066d1eb564b788a31ce5644a318281725342c8ee98f581d8af110c0c9b302e4d9b6e5816802234213d62da53dc34f0fc2715c173e9de79e03ad0
-  data.tar.gz: f318d5debbba3f6cad57d948cc3a16fb716c4bb79f5a84ec0cca5eee3edaadad983103c8188e3b6d83bb4db14393941c1750ba7955903efd8a7f79321e51d6e2
+  metadata.gz: 22e304e89cae6e6bf51429aeb5db10f85e4e5a392ad97117ee0d56617e6c8468a06f5d709160c7f20ec14618c24e8c470c8580d3ae3dbd1c7ea5d90586628f28
+  data.tar.gz: 7102c28210f26c23d49c5bcb58f4e48bec0036231d8133f814aa1d3811e066e92a1af732e484088d0d0f1ae1a51a8637293e9e2506bdf34c0aaa739f6536005a

data/lib/async/io/stream.rb

@@ -38,7 +38,7 @@ module Async
 				end
 			end
 			
-			def initialize(io, block_size: BLOCK_SIZE, maximum_read_size: MAXIMUM_READ_SIZE, sync: true, deferred: nil)
+			def initialize(io, block_size: BLOCK_SIZE, maximum_read_size: MAXIMUM_READ_SIZE, sync: true, deferred: false)
 				@io = io
 				@eof = false
 				
@@ -58,8 +58,6 @@ module Async
 				@input_buffer = Buffer.new
 			end
 			
-			attr_accessor :reactor
-			
 			attr :io
 			attr :block_size
 			
@@ -164,36 +162,29 @@ module Async
 			end
 			
 			# Flushes buffered data to the stream.
-			def flush
+			def flush(deferred: @deferred)
 				unless @write_buffer.empty?
-					if @deferred and task = Task.current
+					if deferred and task = Task.current?
 						if @pending.zero?
-							task.reactor << self
+							@pending += 1
+							task.yield
+						else
+							@pending += 1
+							# task.yield
+							return
 						end
 						
-						@pending += 1
-					else
-						Async.logger.debug(self) {"Flushing immediate write (#{@write_buffer.bytesize} bytes)..."}
+						Async.logger.debug(self) {"Flushing #{@pending} writes (#{@write_buffer.bytesize} bytes)..."}
 						
-						@io.write(@write_buffer)
-						@write_buffer.clear
 						@pending = 0
+					else
+						Async.logger.debug(self) {"Flushing immediate write (#{@write_buffer.bytesize} bytes)..."}
 					end
+					
+					drain_write_buffer
 				end
 			end
 			
-			def alive?
-				@pending > 0
-			end
-			
-			def resume
-				Async.logger.debug(self) {"Flushing #{@pending} writes (#{@write_buffer.bytesize} bytes)..."}
-				
-				@io.write(@write_buffer)
-				@write_buffer.clear
-				@pending = 0
-			end
-			
 			def gets(separator = $/, **options)
 				read_until(separator, **options)
 			end
@@ -219,7 +210,7 @@ module Async
 			end
 			
 			def close_write
-				resume unless @write_buffer.empty?
+				drain_write_buffer
 			ensure
 				@io.close_write
 			end
@@ -229,7 +220,7 @@ module Async
 				return if @io.closed?
 				
 				begin
-					resume unless @write_buffer.empty?
+					drain_write_buffer
 				rescue
 					# We really can't do anything here unless we want #close to raise exceptions.
 				ensure
@@ -259,6 +250,14 @@ module Async
 			
 			private
 			
+			def drain_write_buffer
+				unless @write_buffer.empty?
+					# Async.logger.debug(self, name: "write") {@write_buffer.inspect}
+					@io.write(@write_buffer)
+					@write_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,11 +267,13 @@ module Async
 				
 				if @read_buffer.empty?
 					if @io.read_nonblock(size, @read_buffer, exception: false)
+						# Async.logger.debug(self, name: "read") {@read_buffer.inspect}
 						return true
 					end
 				else
 					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/lib/async/io/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module IO
-		VERSION = "1.26.0"
+		VERSION = "1.27.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-io
 version: !ruby/object:Gem::Version
-  version: 1.26.0
+  version: 1.27.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-14 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async