iodine 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 688611fe0ab9da4acb64bac423d6f72899e981a0
-  data.tar.gz: afa9582b3fde67b3ea77aa7389d078cc00c762ba
+  metadata.gz: b4d5413250301e7bf147d2768d9989815d00ea67
+  data.tar.gz: a4225e75c91425af46c034a37db12fdfca468a3c
 SHA512:
-  metadata.gz: acf6eb30f924bb79ed5026bfef62e4ee30ca09dd07b93a33fc4db8be8237da6f273ac8f9208622099a5c55c3a94894826e65baebdca4c8b87009254206ed4e1a
-  data.tar.gz: 2d9ab314382fe82fa514cc5f38def28d79e39ff5e5c8e66277e972347a788481129f556aafa81bbf54ad0a3410664814844c91cc71876fe41b914e57d1fc3a08
+  metadata.gz: 8e41378d248d5607120b26d96c2b94ad85de20ced37e9ac2091afe4dd8c618e04ffe427a319cd70febae126bfcb79a3a33e7979d5ca291141fac1263a2b7399e
+  data.tar.gz: a6b209fc737a540af696e11c85a981fae392e83e46325e2b3b10dd6fcea9bbc111043313a3ae4af3c3ab7480092458b381074693aa293adfa69d2047b328ab57

data/CHANGELOG.md

@@ -8,6 +8,12 @@ Please notice that this change log contains changes for upcoming releases as wel
 
 ***
 
+Change log v.0.1.16
+
+**Performance**: Http/1 and Http/2 connections now share and recycle their write buffer when while reading the response body and writing it to the IO. This (hopefuly) prevents excess `malloc` calls by the interperter.
+
+***
+
 Change log v.0.1.15
 
 **Update**: IO reactor will now update IO status even when tasks are pending. IO will still be read only when there are no more tasks to handle, but this allows chained tasks to relate to the updated IO status. i.e. this should improve websocket availability for broadcasting (delay from connection to availability might occure until IO is registered).
@@ -20,7 +26,7 @@ Change log v.0.1.14
 
 **Update**: the Response now supports `redirect_to` for both permanent and temporary redirection, with an optional `flash` cookie setup.
 
-**Performance**: the Protocol class now recycles the data string as a thread global socket buffer (different threads have different buffer strings), preventing excessice `malloc` called by the Ruby interpreter. To keep the `data` (in `on_message(data)`) past the `on_message` method's scope, make sure to duplicate it using `data.dup`, or the string's buffer will be recycled.
+**Performance**: the Protocol class now recycles the data string as a thread global socket buffer (different threads have different buffer strings), preventing excessive `malloc` calls by the Ruby interpreter. To keep the `data` (in `on_message(data)`) past the `on_message` method's scope, be sure to duplicate it using `data.dup`, or the string's buffer will be recycled.
 
 ***
 

data/lib/iodine/core.rb

@@ -72,7 +72,7 @@ module Iodine
 	def startup use_rescue = false, hide_message = false
 		@force_running = true
 		threads = []
-		(@thread_count ||= 1).times { threads << Thread.new { Thread.current[:buffer] ||= String.new; cycle } }
+		(@thread_count ||= 1).times { threads << Thread.new { Thread.current[:buffer] ||= String.new; Thread.current[:write_buffer] ||= String.new; cycle } }
 		unless @stop
 			if use_rescue
 				sleep rescue true

data/lib/iodine/http/http1.rb

@@ -17,13 +17,13 @@ module Iodine
 						unless request[:method]
 							l = data.gets.strip
 							if l.bytesize > 16_384
-								write "HTTP/1.0 414 Request-URI Too Long\r\ncontent-length: 20\r\n\r\nRequest URI too Long"
-								Iodine.warn "Http/1 URI too long, closing connection."
+								write "HTTP/1.0 414 Request-URI Too Long\r\ncontent-length: 20\r\n\r\nRequest URI too Long".freeze
+								Iodine.warn "Http/1 URI too long, closing connection.".freeze
 								return close
 							end
 							next if l.empty?
 							request[:method], request[:query], request[:version] = l.split(/[\s]+/.freeze, 3)
-							return (Iodine.warn('Htt1 Protocol Error, closing connection.') && close) unless request[:method] =~ HTTP_METHODS_REGEXP
+							return (Iodine.warn('Htt1 Protocol Error, closing connection.'.freeze) && close) unless request[:method] =~ HTTP_METHODS_REGEXP
 							request[:version] = (request[:version] || '1.1'.freeze).match(/[\d\.]+/.freeze)[0]
 							request[:time_recieved] = Time.now
 						end
@@ -41,12 +41,12 @@ module Iodine
 								request[:headers_complete] = true
 							else
 								#protocol error
-								Iodine.warn 'Protocol Error, closing connection.'
+								Iodine.warn 'Protocol Error, closing connection.'.freeze
 								return close
 							end
 							if request.length > 2096 || request[:headers_size] > 262_144
-								write "HTTP/1.0 431 Request Header Fields Too Large\r\ncontent-length: 31\r\n\r\nRequest Header Fields Too Large"
-								return (Iodine.warn('Http1 header overloading, closing connection.') && close)
+								write "HTTP/1.0 431 Request Header Fields Too Large\r\ncontent-length: 31\r\n\r\nRequest Header Fields Too Large".freeze
+								return (Iodine.warn('Http1 header overloading, closing connection.'.freeze) && close)
 							end
 						end
 						until request[:body_complete] && request[:headers_complete]
@@ -56,7 +56,7 @@ module Iodine
 									chunk = data.gets
 									return false unless chunk
 									@parser[:length] = chunk.to_i(16)
-									return (Iodine.warn('Protocol Error, closing connection.') && close) unless @parser[:length]
+									return (Iodine.warn('Protocol Error, closing connection.'.freeze) && close) unless @parser[:length]
 									request[:body_complete] = true && break if @parser[:length] == 0
 									@parser[:act_length] = 0
 									request[:body] ||= Tempfile.new('iodine'.freeze, :encoding => 'binary'.freeze)
@@ -73,7 +73,7 @@ module Iodine
 								request[:body] << packet
 								request[:body_complete] = true if request['content-length'.freeze].to_i - request[:body].size <= 0
 							elsif request['content-type'.freeze]
-								Iodine.warn 'Body type protocol error.' unless request[:body]
+								Iodine.warn 'Body type protocol error.'.freeze unless request[:body]
 								line = data.gets
 								return false unless line
 								(request[:body] ||= Tempfile.new('iodine'.freeze, :encoding => 'binary'.freeze) ) << line
@@ -85,7 +85,7 @@ module Iodine
 						if request[:body] && request[:body].size > ::Iodine::Http.max_http_buffer
 							Iodine.warn("Http1 message body too big, closing connection (Iodine::Http.max_http_buffer == #{::Iodine::Http.max_http_buffer} bytes) - #{request[:body].size} bytes.")
 							request.delete(:body).tap {|f| f.close unless f.closed? } rescue false
-							write "HTTP/1.0 413 Payload Too Large\r\ncontent-length: 17\r\n\r\nPayload Too Large"
+							write "HTTP/1.0 413 Payload Too Large\r\ncontent-length: 17\r\n\r\nPayload Too Large".freeze
 							return close
 						end
 						(@request = ::Iodine::Http::Request.new(self)) && ( (::Iodine::Http.http2 && ::Iodine::Http::Http2.handshake(request, self, data)) || dispatch(request, data) ) if request.delete :body_complete
@@ -109,17 +109,15 @@ module Iodine
 				else
 					headers['connection'.freeze] ||= 'close'.freeze
 				end
-
 				send_headers response
 				return log_finished(response) && (body && body.close) if request.head? || body.nil?
-				buffer = String.new
+				
 				until body.eof?
-					written = write(body.read 65_536, buffer)
+					written = write(body.read 65_536, Thread.current[:write_buffer])
 					return Iodine.warn("Http/1 couldn't send response because connection was lost.".freeze) && body.close unless written
 					response.bytes_written += written
 				end
 				body.close
-				buffer.clear
 				close unless keep_alive
 				log_finished response
 			end
@@ -133,9 +131,8 @@ module Iodine
 				end
 				return if response.request.head?
 				body = response.extract_body
-				buffer = String.new
 				until body.eof?
-					written = stream_data(body.read 65_536, buffer)
+					written = stream_data(body.read 65_536, Thread.current[:write_buffer])
 					return Iodine.warn("Http/1 couldn't send response because connection was lost.".freeze) && body.close unless written
 					response.bytes_written += written
 				end if body
@@ -144,7 +141,6 @@ module Iodine
 					log_finished response
 					close unless response.keep_alive
 				end
-				buffer.clear
 				body.close if body
 				true
 			end
@@ -197,8 +193,9 @@ module Iodine
 				headers = response.headers
 
 				# response['date'.freeze] ||= request[:time_recieved].httpdate
+				(out = (Thread.current[:headers_buffer] ||= String.new)).clear
 
-				out = "HTTP/#{request[:version]} #{response.status} #{::Iodine::Http::Response::STATUS_CODES[response.status] || 'unknown'}\r\n"
+				out << "HTTP/#{request[:version]} #{response.status} #{::Iodine::Http::Response::STATUS_CODES[response.status] || 'unknown'}\r\n"
 
 				out << request[:time_recieved].utc.strftime("Date: %a, %d %b %Y %H:%M:%S GMT\r\n".freeze) unless headers['date'.freeze]
 
@@ -209,7 +206,6 @@ module Iodine
 				out << "\r\n"
 
 				response.bytes_written += (write(out) || 0)
-				out.clear
 				headers.freeze
 				response.raw_cookies.freeze
 			end
@@ -222,7 +218,9 @@ module Iodine
 				request = response.request
 				return if Iodine.logger.nil? || request[:no_log]
 				t_n = Time.now
-				Iodine.log("#{request[:client_ip]} [#{t_n.utc}] \"#{request[:method]} #{request[:original_path]} #{request[:scheme]}\/#{request[:version]}\" #{response.status} #{response.bytes_written.to_s} #{((t_n - request[:time_recieved])*1000).round(2)}ms\n").clear
+				(Thread.current[:log_buffer] ||= String.new).clear
+				Thread.current[:log_buffer] << "#{request[:client_ip]} [#{t_n.utc}] \"#{request[:method]} #{request[:original_path]} #{request[:scheme]}\/#{request[:version]}\" #{response.status} #{response.bytes_written.to_s} #{((t_n - request[:time_recieved])*1000).round(2)}ms\n"
+				Iodine.log(Thread.current[:log_buffer])
 			end
 		end
 	end

data/lib/iodine/http/http2.rb

@@ -57,7 +57,6 @@ module Iodine
 				data = ::StringIO.new data
 				parse_preface data unless @connected
 				true while parse_frame data
-				data.string.clear
 			end
 
 			def send_response response
@@ -67,12 +66,10 @@ module Iodine
 				return body && body.close unless send_headers response, request
 				return log_finished(response) && body && body.close if request.head?
 				if body
-					buffer = String.new
 					until body.eof?
-						response.bytes_written += emit_payload(body.read(@settings[SETTINGS_MAX_FRAME_SIZE], buffer), request[:sid], 0, (body.eof? ? 1 : 0))
+						response.bytes_written += emit_payload(body.read(@settings[SETTINGS_MAX_FRAME_SIZE], Thread.current[:write_buffer]), request[:sid], 0, (body.eof? ? 1 : 0))
 					end
 					body.close
-					buffer.clear
 				else
 					emit_payload(''.freeze, request[:sid], 0, 1)
 				end
@@ -85,11 +82,9 @@ module Iodine
 				send_headers response, request
 				return body && body.close if request.head?
 				if body
-					buffer = String.new
 					until body.eof?
-						response.bytes_written += emit_payload(body.read(@settings[SETTINGS_MAX_FRAME_SIZE], buffer), request[:sid], 0, ((finish && body.eof?) ? 1 : 0))
+						response.bytes_written += emit_payload(body.read(@settings[SETTINGS_MAX_FRAME_SIZE], Thread.current[:write_buffer]), request[:sid], 0, ((finish && body.eof?) ? 1 : 0))
 					end
-					buffer.clear
 					body.close
 				elsif finish
 					emit_payload(''.freeze, request[:sid], 0, 1)
@@ -146,7 +141,9 @@ module Iodine
 				request = response.request
 				return if Iodine.logger.nil? || request[:no_log]
 				t_n = Time.now
-				Iodine.log("#{request[:client_ip]} [#{t_n.utc}] #{request[:method]} #{request[:original_path]} #{request[:scheme]}\/2 #{response.status} #{response.bytes_written.to_s} #{((t_n - request[:time_recieved])*1000).round(2)}ms\n").clear
+				(Thread.current[:log_buffer] ||= String.new).clear
+				Thread.current[:log_buffer] << "#{request[:client_ip]} [#{t_n.utc}] #{request[:method]} #{request[:original_path]} #{request[:scheme]}\/2 #{response.status} #{response.bytes_written.to_s} #{((t_n - request[:time_recieved])*1000).round(2)}ms\n"
+				Iodine.log Thread.current[:log_buffer]
 			end
 
 			def send_headers response, request
@@ -155,7 +152,10 @@ module Iodine
 				# headers[:status] = response.status.to_s
 				headers['set-cookie'] = response.extract_cookies
 				headers.freeze
-				emit_payload (@hpack.encode(status: response.status.to_s) + @hpack.encode(headers)), request[:sid], 1, (request.head? ? 1 : 0)
+				(out = (Thread.current[:headers_buffer] ||= String.new)).clear
+				out <<  @hpack.encode(headers)
+				emit_payload (out), request[:sid], 1, (request.head? ? 1 : 0)
+				out.clear
 				return true
 			end
 

data/lib/iodine/http/websockets.rb

@@ -16,7 +16,7 @@ module Iodine
 			end
 			# handle broadcasts.
 			def on_broadcast data
-				@locker.synchronize { @handler.on_broadcast(data) if @handler.respond_to? :on_broadcast }
+				@locker.synchronize { @handler.on_broadcast(data) } if @handler.respond_to? :on_broadcast
 			end
 			# cleanup after closing.
 			def on_close

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler