async-io 1.27.7 → 1.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f36b84a41e617dbb5ffd863ecaf7b68761f6cdbc4969052372ef67071e98b85b
-  data.tar.gz: 5c655fceda94aaae5b17166e7c039e60558dee99755875dbaa51e1f58244f2a0
+  metadata.gz: d3efc5254f6ca150d428d1a13eeaf36775c9a7f0fe3f3859069eb30db4d6b907
+  data.tar.gz: 287aa5c3bd8e31304a3d60a7f278bd48307224aa457b67ec766d9c160731a37c
 SHA512:
-  metadata.gz: d3fa287b88b45a084bf750cbd5343f02ad0848c0340ba653937933aeec0c980a61e779c6322afcbcb9ada9fd263d92a35fd9b8d5fb5616df3e9d535d06cb6a8b
-  data.tar.gz: ca1ea7afbee6741820cd9b058fc1bcaa2b1b1f89352280a484ca1ae5732fd2447ec71f4b06deb0d5d0d965e80a00bb17c567ea3188a11c1368eaa26c976a66a4
+  metadata.gz: e8be3b2eb8024ebcea499eafe4845415684ab56a7a952141ef4cccb0e91fb7cde2f439734cb4a126051e9de3f349eb15ee59e65f55292d8705cd900c6ebfca4e
+  data.tar.gz: 9b46e1c7eb93a45e72cd5b0698b57213f31b4f8fc23c546f0bf887fd1e0cc17c9978fa03adb52f58cffb8a4b53df87bb16a514d02b676d7913102e57bac11df8

data/.travis.yml

@@ -2,9 +2,10 @@ language: ruby
 dist: xenial
 cache: bundler
 
+script: bundle exec rspec
+
 matrix:
   include:
-    - rvm: 2.4
     - rvm: 2.5
     - rvm: 2.6
     - rvm: 2.7

data/Gemfile

@@ -5,13 +5,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in async-io.gemspec
 gemspec
 
-group :development do
-	gem 'pry'
-	gem 'guard-rspec'
-	
-	gem 'bake-bundler'
-end
-
 group :test do
 	gem 'benchmark-ips'
 	gem 'ruby-prof', platforms: :mri

data/async-io.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "async", "~> 1.14"
 	spec.add_development_dependency "async-rspec", "~> 1.10"
 
-	spec.required_ruby_version = '~> 2.4'
+	spec.required_ruby_version = '~> 2.5'
 	
 	spec.add_development_dependency "async-container", "~> 0.15"
 	
 	spec.add_development_dependency "covered"
 	spec.add_development_dependency "bundler"
-	spec.add_development_dependency "rake", "~> 10.0"
+	spec.add_development_dependency "bake-bundler"
 	spec.add_development_dependency "rspec", "~> 3.0"
 end

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/lib/async/io/version.rb

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

data/spec/async/io/shared_endpoint_spec.rb

@@ -23,8 +23,6 @@
 require 'async/io/host_endpoint'
 require 'async/io/shared_endpoint'
 
-require 'pry'
-
 RSpec.describe Async::IO::SharedEndpoint do
 	include_context Async::RSpec::Reactor
 	

data/spec/async/io/stream_spec.rb

@@ -83,7 +83,7 @@ RSpec.describe Async::IO::Stream do
 				
 				task = reactor.async do
 					output.write("Hello World")
-					output.flush(deferred: true)
+					output.flush
 				end
 				
 				expect do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-io
 version: !ruby/object:Gem::Version
-  version: 1.27.7
+  version: 1.28.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bake-bundler
   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
@@ -204,7 +204,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:
   - - ">="