async-io 1.24.0 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0614be3c203f3e9b8de82215fdacbe3a9bccdcd9b82784af349aa3149d63419
-  data.tar.gz: da66baf1cea7ee3ba1411eee6c09a7eeef5faef39e40ce6459fcd8002df2437b
+  metadata.gz: 8e01be4ac327bd569ca94ab2dee892e146d09dcba53d07602b01b77362c2601d
+  data.tar.gz: cef6ce9421a1f1d8ce9848390e998c251d2972de5915ed47459f8c5352620aca
 SHA512:
-  metadata.gz: 3624d5fe1177e65b87cb75fdec5eaeac9ef25543d423a66333c6de3b2826f656d0e7acdf5742741b2a7744518baa482f987584829aa6f2ebf140339161bf13be
-  data.tar.gz: d12bdfe724ba95f6f39cbc68bf21b7df0c16537f1c5dd689e70f102609ce6c75502d2cc41478546c9704d42bfdcdafbdc9e63a5cc5cc300ccf08610d4c533f96
+  metadata.gz: d3d5506e50c9d3ea3259a87a90943565071317f11d277b08608bbfc35ce5b85441e0521950716cd37f20d56a2591544a376624e9bf8d029c338ce748ecef6c9b
+  data.tar.gz: 45114022177aba3e1caf2680cb49754b1ad511487a4327f66851c30fca4a832255545169c275c1dd387aff6c7c241a3286a5241f77de6d4c89b759fc50ec264e

data/.travis.yml

@@ -14,6 +14,11 @@ matrix:
     - rvm: jruby-head
       env: JRUBY_OPTS="--debug -X+O"
     - rvm: ruby-head
+    - rvm: 2.6
+      os: osx
+    - rvm: 2.6
+      os: osx
+      gemfile: gems/nio4r-2.3.gemfile
   allow_failures:
     - rvm: ruby-head
     - rvm: truffleruby

data/examples/millions/server.rb

@@ -18,7 +18,7 @@ class Server
 			task.async do |subtask|
 				while true
 					subtask.sleep 10
-					puts "Connection count: #{@connections.count}"
+					puts "Connection count: #{@connections.size}"
 				end
 			end
 				

data/gems/nio4r-2.3.gemfile

@@ -0,0 +1,3 @@
+eval_gemfile("../Gemfile")
+
+gem "nio4r", "~> 2.3.0"

data/lib/async/io/generic.rb

@@ -38,6 +38,10 @@ module Async
 			end
 		end
 		
+		def self.pipe
+			::IO.pipe.map(&Generic.method(:new))
+		end
+		
 		# Represents an asynchronous IO within a reactor.
 		class Generic < Wrapper
 			extend Forwardable

data/lib/async/io/shared_endpoint.rb

@@ -86,7 +86,7 @@ module Async
 					peer = peer.dup
 					
 					task.async do |task|
-						task.annotate "connected to #{peer.inspect}"
+						task.annotate "connected to #{peer.inspect} [#{peer.fileno}]"
 						
 						begin
 							yield peer, task
@@ -104,7 +104,7 @@ module Async
 			end
 			
 			def to_s
-				"\#<#{self.class} #{@wrappers.count} descriptors for #{@endpoint}>"
+				"\#<#{self.class} #{@wrappers.size} descriptors for #{@endpoint}>"
 			end
 		end
 	end

data/lib/async/io/socket.rb

@@ -93,7 +93,7 @@ module Async
 		
 		module Server
 			def accept_each(timeout: nil, task: Task.current)
-				task.annotate "accepting connections #{self.local_address.inspect}"
+				task.annotate "accepting connections #{self.local_address.inspect} [fd=#{self.fileno}]"
 				
 				callback = lambda do |io, address|
 					yield io, address, task: task
@@ -131,7 +131,7 @@ module Async
 				return wrapper, address unless block_given?
 				
 				task.async do |task|
-					task.annotate "incoming connection #{address.inspect}"
+					task.annotate "incoming connection #{address.inspect} [fd=#{wrapper.fileno}]"
 					
 					begin
 						yield wrapper, address
@@ -197,7 +197,7 @@ module Async
 				
 				begin
 					wrapper.connect(remote_address.to_sockaddr)
-					task.annotate "connected to #{remote_address.inspect}"
+					task.annotate "connected to #{remote_address.inspect} [fd=#{wrapper.fileno}]"
 				rescue Exception
 					wrapper.close
 					raise

data/lib/async/io/ssl_socket.rb

@@ -111,6 +111,10 @@ module Async
 				@context = context
 			end
 			
+			def fileno
+				@server.fileno
+			end
+			
 			def dup
 				self.class.new(@server.dup, @context)
 			end

data/lib/async/io/stream.rb

@@ -82,13 +82,9 @@ module Async
 			# Read at most `size` bytes from the stream. Will avoid reading from the underlying stream if possible.
 			def read_partial(size = nil)
 				return '' if size == 0
-				
-				unless @eof
-					if size and @read_buffer.bytesize < size
-						fill_read_buffer(size > @block_size ? size : @block_size)
-					elsif @read_buffer.empty?
-						fill_read_buffer
-					end
+			
+				if !@eof and @read_buffer.empty?
+					fill_read_buffer
 				end
 				
 				return consume_read_buffer(size)
@@ -215,9 +211,13 @@ module Async
 			
 			# Returns true if the stream is at file which means there is no more data to be read.
 			def eof?
-				fill_read_buffer if !@eof && @read_buffer.empty?
+				return false unless @read_buffer.empty?
+				
+				if !@eof
+					fill_read_buffer
+				end
 				
-				return @eof && @read_buffer.empty?
+				return @eof
 			end
 			
 			alias eof eof?
@@ -238,16 +238,20 @@ module Async
 					size = @maximum_read_size
 				end
 				
-				if @read_buffer.empty? and @io.read_nonblock(size, @read_buffer, exception: false)
-					return true
-				elsif chunk = @io.read_nonblock(size, @input_buffer, exception: false)
-					@read_buffer << chunk
-					return true
+				if @read_buffer.empty?
+					if @io.read_nonblock(size, @read_buffer, exception: false)
+						return true
+					end
 				else
-					# We didn't read anything, so we must be at eof:
-					@eof = true
-					return false
+					if chunk = @io.read_nonblock(size, @input_buffer, exception: false)
+						@read_buffer << chunk
+						return true
+					end
 				end
+				
+				# else for both cases above:
+				@eof = true
+				return false
 			end
 			
 			# Consumes at most `size` bytes from the buffer.

data/lib/async/io/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module IO
-		VERSION = "1.24.0"
+		VERSION = "1.25.0"
 	end
 end

data/spec/async/io/c10k_spec.rb

@@ -51,13 +51,13 @@ RSpec.describe "echo client/server", if: Process.respond_to?(:fork) do
 			Async::IO::Socket.bind(server_address) do |server|
 				server.listen(Socket::SOMAXCONN)
 				
-				while connections.count < repeats
+				while connections.size < repeats
 					peer, address = server.accept
 					connections << peer
 				end
 			end.wait
 			
-			puts "Releasing #{connections.count} connections..."
+			puts "Releasing #{connections.size} connections..."
 			
 			while connection = connections.pop
 				connection.write(".")
@@ -124,7 +124,7 @@ RSpec.describe "echo client/server", if: Process.respond_to?(:fork) do
 				
 				tasks.each(&:wait)
 				
-				expect(responses.count).to be repeats
+				expect(responses.size).to be repeats
 			end
 			
 		# ensure

data/spec/async/io/echo_spec.rb

@@ -68,6 +68,6 @@ RSpec.describe "echo client/server" do
 		tasks.each(&:wait)
 		server.stop
 		
-		expect(responses.count).to be repeats
+		expect(responses.size).to be repeats
 	end
 end

data/spec/async/io/generic_examples.rb

@@ -68,4 +68,4 @@ RSpec.shared_examples Async::IO do
 		
 		expect(subject.read).to be == data
 	end
-end
+end

data/spec/async/io/generic_spec.rb

@@ -66,7 +66,7 @@ RSpec.describe Async::IO::Generic do
 					input.wait(1, :read)
 				end
 				
-				expect(duration).to be_within(50).percent_of(wait_duration)
+				expect(duration).to be_within(100).percent_of(wait_duration)
 				expect(input.read(1024)).to be == message
 				
 				input.close
@@ -92,7 +92,7 @@ RSpec.describe Async::IO::Generic do
 					expect(input.wait(wait_duration, :read)).to be_nil
 				end
 				
-				expect(duration).to be_within(50).percent_of(wait_duration)
+				expect(duration).to be_within(100).percent_of(wait_duration)
 				
 				input.close
 			end

data/spec/async/io/ssl_server_spec.rb

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 require 'async/io/ssl_socket'
+require 'async/io/ssl_endpoint'
 
 require 'async/rspec/ssl'
 require_relative 'generic_examples'

data/spec/async/io/stream_spec.rb

@@ -98,7 +98,7 @@ RSpec.describe Async::IO::Stream do
 			data = nil
 			
 			duration = Async::Clock.measure do
-				data = stream.read(4*1024**3)
+				data = stream.read(1024**3)
 			end
 			
 			size = data.bytesize / 1024**2
@@ -106,7 +106,7 @@ RSpec.describe Async::IO::Stream do
 			
 			example.reporter.message "Read #{size.round(2)}MB of data at #{rate.round(2)}MB/s."
 			
-			expect(rate).to be > 512
+			expect(rate).to be > 128
 		end
 	end
 	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-io
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.25.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-13 00:00:00.000000000 Z
+date: 2019-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -135,6 +135,7 @@ files:
 - 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