async-io 1.27.0 → 1.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59838b8c517c12bc36a08b4c235ee149c235f4b61bd405f1548cc2a9eedf0e20
-  data.tar.gz: afe198be21f60e75ff8392d8a86c17da15f2144ad5328fd604b5439c0e14fd7e
+  metadata.gz: d7128e6848ad5bdee711dc7a8d1b2b13be4ced2b32cc18c3f067375a968ce59a
+  data.tar.gz: 3b2537d7467f536c65de6740042e59ae257dac49ebc07136167e239a47c2c356
 SHA512:
-  metadata.gz: 22e304e89cae6e6bf51429aeb5db10f85e4e5a392ad97117ee0d56617e6c8468a06f5d709160c7f20ec14618c24e8c470c8580d3ae3dbd1c7ea5d90586628f28
-  data.tar.gz: 7102c28210f26c23d49c5bcb58f4e48bec0036231d8133f814aa1d3811e066e92a1af732e484088d0d0f1ae1a51a8637293e9e2506bdf34c0aaa739f6536005a
+  metadata.gz: 80a3e758f2288cf0b01d9daad23914d2bf4b72a933d06483759bfdaf9fb38add65539dc4b4854a0bc0e1237baf72ab716f46c5e3401153e8bd6367f8c93b6379
+  data.tar.gz: 66221768e8c2b71f448868d769bdffe2faea1af137ebe7cbe1e223763bb92424633f02f6ada580eb0b6a4f3f5f777202b3342d0dc7509e585c41a3fcf7154e99

data/README.md

@@ -123,6 +123,12 @@ Async do |task|
 end
 ```
 
+### Deferred Buffering
+
+`Async::IO::Stream.new(..., deferred:true)` creates a deferred stream which increases latency slightly, but reduces the number of total packets sent. It does this by combining all calls `Stream#flush` within a single iteration of the reactor. This is typically more useful on the client side, but can also be useful on the server side when individual packets have high latency. It should be preferable to send one 100 byte packet than 10x 10 byte packets.
+
+Servers typically only deal with one request per iteartion of the reactor so it's less useful. Clients which make multiple requests can benefit significantly e.g. HTTP/2 clients can merge many requests into a single packet. Because HTTP/2 recommends disabling Nagle's algorithm, this is often beneficial.
+
 ## Contributing
 
 1. Fork it

data/lib/async/io.rb

@@ -29,10 +29,8 @@ require_relative "io/endpoint/each"
 
 module Async
 	module IO
-		@file_descriptor_limit = nil
-		
 		def self.file_descriptor_limit
-			@file_descriptor_limit ||= Integer(`ulimit -n`) rescue nil
+			Process.getrlimit(Process::RLIMIT_NOFILE).first
 		end
 	end
 end

data/lib/async/io/stream.rb

@@ -59,6 +59,7 @@ module Async
 			end
 			
 			attr :io
+			
 			attr :block_size
 			
 			# Reads `size` bytes from the stream. If size is not specified, read until end of file.
@@ -66,7 +67,7 @@ module Async
 				return '' if size == 0
 				
 				if size
-					until @eof or @read_buffer.size >= size
+					until @eof or @read_buffer.bytesize >= size
 						# Compute the amount of data we need to read from the underlying stream:
 						read_size = size - @read_buffer.bytesize
 						
@@ -115,7 +116,7 @@ module Async
 				split_offset = pattern.bytesize - 1
 				
 				until index = @read_buffer.index(pattern, offset)
-					offset = @read_buffer.size - split_offset
+					offset = @read_buffer.bytesize - split_offset
 					
 					offset = 0 if offset < 0
 					
@@ -145,9 +146,8 @@ module Async
 				else
 					@write_buffer << string
 					
-					if @write_buffer.size >= @block_size
-						@io.write(@write_buffer)
-						@write_buffer.clear
+					if @write_buffer.bytesize >= @block_size
+						drain_write_buffer
 					end
 				end
 				
@@ -163,25 +163,16 @@ module Async
 			
 			# Flushes buffered data to the stream.
 			def flush(deferred: @deferred)
-				unless @write_buffer.empty?
-					if deferred and task = Task.current?
-						if @pending.zero?
-							@pending += 1
-							task.yield
-						else
-							@pending += 1
-							# task.yield
-							return
-						end
-						
-						Async.logger.debug(self) {"Flushing #{@pending} writes (#{@write_buffer.bytesize} bytes)..."}
-						
+				if deferred and task = Task.current?
+					@pending += 1
+					
+					if @pending == 1
+						task.yield
+						drain_write_buffer unless @write_buffer.empty?
 						@pending = 0
-					else
-						Async.logger.debug(self) {"Flushing immediate write (#{@write_buffer.bytesize} bytes)..."}
 					end
-					
-					drain_write_buffer
+				else
+					drain_write_buffer unless @write_buffer.empty?
 				end
 			end
 			
@@ -189,9 +180,9 @@ module Async
 				read_until(separator, **options)
 			end
 			
-			def puts(*args, separator: $/)
-				args.each do |arg|
-					@write_buffer << arg << separator
+			def puts(*arguments, separator: $/)
+				arguments.each do |argument|
+					@write_buffer << argument << separator
 				end
 				
 				flush
@@ -220,7 +211,7 @@ module Async
 				return if @io.closed?
 				
 				begin
-					drain_write_buffer
+					drain_write_buffer unless @write_buffer.empty?
 				rescue
 					# We really can't do anything here unless we want #close to raise exceptions.
 				ensure
@@ -251,11 +242,17 @@ 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
+				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
+				
+				# Async.logger.debug(self, name: "write") {@write_buffer.inspect}
+				@io.write(@write_buffer)
+				@write_buffer.clear
 			end
 			
 			# Fills the buffer from the underlying stream.
@@ -265,6 +262,11 @@ module Async
 					size = @maximum_read_size
 				end
 				
+				# This effectively ties the input and output stream together.
+				if @pending > 0
+					drain_write_buffer
+				end
+				
 				if @read_buffer.empty?
 					if @io.read_nonblock(size, @read_buffer, exception: false)
 						# Async.logger.debug(self, name: "read") {@read_buffer.inspect}
@@ -291,7 +293,7 @@ module Async
 				
 				result = nil
 				
-				if size.nil? or size >= @read_buffer.size
+				if size.nil? or size >= @read_buffer.bytesize
 					# Consume the entire read buffer:
 					result = @read_buffer
 					@read_buffer = Buffer.new

data/lib/async/io/version.rb

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

data/spec/async/io/c10k_spec.rb

@@ -24,7 +24,7 @@ require 'open3'
 
 # require 'ruby-prof'
 
-RSpec.describe "echo client/server", if: Process.respond_to?(:fork) do
+RSpec.describe "c10k echo client/server", if: Process.respond_to?(:fork) do
 	# macOS has a rediculously hard time to do this.
 	# sudo sysctl -w net.inet.ip.portrange.first=10000
 	# sudo sysctl -w net.inet.ip.portrange.hifirst=10000

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-io
 version: !ruby/object:Gem::Version
-  version: 1.27.0
+  version: 1.27.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Provides support for asynchonous TCP, UDP, UNIX and SSL sockets.