async-io 1.12.2 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '02688119fe7ef47b527495b74b5b60d5826de683dc4bc798b63f6c61ee962049'
-  data.tar.gz: c15e88f8b47470fe35b97ba674faaa20ac39f3cbab617a47523b66c516103125
+  metadata.gz: c10de5ece88f5f8366c2560647ab2cc061c12d49790cf1f3aafb6516d0fd7ad4
+  data.tar.gz: c970a916f8e637098bf85a842d27709cb34dae68ded5386451be3f433673d12e
 SHA512:
-  metadata.gz: 224d6230ea743a3c4d5132222d4ef74c61362fa487c8da642ee470333be2cb8656604f5b4ccec4d28e0b799c22d13207c605ad1c4a53f2614e6cbc13c7d9ccf3
-  data.tar.gz: a129eceb200dc5171465d6b6f902efcf37d2c6b4d722c5ae1b82c716e66e78a77c8585742950482006a89fc86fc166ec6d83ce641eea09b7ef0e2ceefd7326f9
+  metadata.gz: ab731c4a8ec3e2f9a3b459e62391a5294b2234ca0a62cf066f435ba33324f174f60676660924cba2ef25c8fae00fb85bb2b4556c4c96cecdbdd1bd7e9c798f35
+  data.tar.gz: 12c30f60cc9e1859664a79d9d6378c690d0756234410699ae79d5fbd837f014ccc10811ff4feb7ec38cda025fe300cac95051aaff5015808ec595a7107c2d426

data/.editorconfig

@@ -0,0 +1,5 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4

data/.travis.yml

@@ -7,12 +7,12 @@ before_script:
   - gem update --system
   - gem install bundler
 
-
 matrix:
   include:
     - rvm: 2.3
     - rvm: 2.4
     - rvm: 2.5
+    - rvm: 2.6
     - rvm: jruby-head
       env: JRUBY_OPTS="--debug -X+O"
     - rvm: ruby-head

data/async-io.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 	spec.has_rdoc      = "yard"
 
 	spec.add_dependency "async", "~> 1.3"
-	spec.add_development_dependency "async-rspec", "~> 1.6"
+	spec.add_development_dependency "async-rspec", "~> 1.7"
 
 	spec.required_ruby_version = '~> 2.3'
 

data/examples/allocations.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+require_relative "../lib/async/io/stream"
+# require "async/io/stream"
+require "stringio"
+
+io = StringIO.new("a" * (50*1024*1024))
+stream = Async::IO::Stream.new(io)
+
+GC.disable
+
+start_memory = `ps -p #{Process::pid} -o rss`.split("\n")[1].chomp.to_i
+
+while (chunk = stream.read_partial)
+	chunk.clear
+end
+
+end_memory = `ps -p #{Process::pid} -o rss`.split("\n")[1].chomp.to_i
+puts "#{(end_memory - start_memory).to_f / 1024} MB"

data/examples/chat/server.rb

@@ -22,8 +22,7 @@ class User < Async::IO::Protocol::Line
 end
 
 class Server
-	def initialize(endpoint)
-		@endpoint = endpoint
+	def initialize
 		@users = Set.new
 	end
 	
@@ -61,9 +60,9 @@ class Server
 		broadcast("#{user} has disconnected: #{reason}")
 	end
 	
-	def run
+	def run(endpoint)
 		Async::Reactor.run do |task|
-			@endpoint.accept do |peer|
+			endpoint.accept do |peer|
 				stream = Async::IO::Stream.new(peer)
 				user = User.new(stream)
 				
@@ -75,7 +74,9 @@ class Server
 	end
 end
 
-endpoint = Async::IO::Endpoint.parse(ARGV.pop || "tcp://localhost:7138")
-server = Server.new(endpoint)
+Async.logger.level = Logger::INFO
+Async.logger.info("Starting server...")
+server = Server.new
 
-server.run
+endpoint = Async::IO::Endpoint.parse(ARGV.pop || "tcp://localhost:7138")
+server.run(endpoint)

data/lib/async/io/stream.rb

@@ -39,6 +39,9 @@ module Async
 				
 				@read_buffer = BinaryString.new
 				@write_buffer = BinaryString.new
+				
+				# Used as destination buffer for underlying reads.
+				@input_buffer = BinaryString.new
 			end
 			
 			attr :io
@@ -180,19 +183,16 @@ module Async
 			
 			# Fills the buffer from the underlying stream.
 			def fill_read_buffer
-				# Can we read directly into the buffer? (Ruby doesn't support append, only replace):
-				if @read_buffer.empty?
-					if @io.read(@block_size, @read_buffer)
-						return true
-					end
-				elsif chunk = @io.read(@block_size)
+				if @read_buffer.empty? and @io.read(@block_size, @read_buffer)
+					return true
+				elsif chunk = @io.read(@block_size, @input_buffer)
 					@read_buffer << chunk
 					return true
+				else
+					# We didn't read anything, so we must be at eof:
+					@eof = true
+					return false
 				end
-				
-				# We didn't read anything, so we must be at eof:
-				@eof = true
-				return false
 			end
 
 			# Consumes at most `size` bytes from the buffer.
@@ -205,8 +205,8 @@ module Async
 				
 				if size == nil || size >= @read_buffer.size
 					# Consume the entire read buffer:
-					result = @read_buffer.dup
-					@read_buffer.clear
+					result = @read_buffer
+					@read_buffer = BinaryString.new
 				else
 					# Consume only part of the read buffer:
 					result = @read_buffer.slice!(0, size)

data/lib/async/io/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module IO
-		VERSION = "1.12.2"
+		VERSION = "1.12.3"
 	end
 end

data/spec/async/io/stream_spec.rb

@@ -21,6 +21,8 @@
 require 'async/io/stream'
 
 RSpec.describe Async::IO::Stream do
+	include_context Async::RSpec::Memory
+	
 	let(:io) {StringIO.new}
 	let(:stream) {Async::IO::Stream.new(io)}
 	
@@ -47,11 +49,19 @@ RSpec.describe Async::IO::Stream do
 			expect(stream.read(20)).to be == "o World"
 			expect(stream).to be_eof
 		end
+		
+		context "with large content" do
+			let!(:io) { StringIO.new("a" * 5*1024*1024) }
+			
+			it "allocates expected amount of bytes" do
+				expect do
+					stream.read(16*1024).clear until stream.eof?
+				end.to limit_allocations(size: 100*1024)
+			end
+		end
 	end
 	
 	describe '#read_until' do
-		include_context Async::RSpec::Memory
-		
 		it "can read a line" do
 			io.write("hello\nworld\n")
 			io.seek(0)
@@ -61,13 +71,14 @@ RSpec.describe Async::IO::Stream do
 			expect(stream.read_until("\n")).to be_nil
 		end
 		
-		it "minimises allocations" do
-			io.write("hello\nworld\n")
-			io.seek(0)
+		context "with large content" do
+			let!(:io) { StringIO.new("a" * 5*1024*1024 + "b") }
 			
-			expect do
-				stream.read_until("\n")
-			end.to limit_allocations(String => 3)
+			it "allocates expected amount of bytes" do
+				expect do
+					stream.read_until("b").clear
+				end.to limit_allocations(size: 100*1024)
+			end
 		end
 	end
 	
@@ -96,6 +107,16 @@ RSpec.describe Async::IO::Stream do
 			
 			expect(stream.read_partial(11)).to be == "Hello World"
 		end
+		
+		context "with large content" do
+			let!(:io) { StringIO.new("a" * 5*1024*1024) }
+			
+			it "allocates expected amount of bytes" do
+				expect do
+					stream.read_partial(16*1024).clear until stream.eof?
+				end.to limit_allocations(size: 100*1024)
+			end
+		end
 	end
 	
 	describe '#write' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-io
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.12.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-10 00:00:00.000000000 Z
+date: 2018-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -94,6 +95,7 @@ files:
 - README.md
 - Rakefile
 - async-io.gemspec
+- examples/allocations.rb
 - examples/chat/client.rb
 - examples/chat/server.rb
 - examples/issues/broken_ssl.rb