Cleanup benchmark code.

Author: samuel-williams-shopify

benchmark/server/event.rb

@@ -23,10 +23,8 @@
 		peer, address = server.accept
 
 		Fiber.schedule do
-			while (peer.readpartial(1024) rescue nil)
-				peer.write(RESPONSE)
-			end
-			
+			peer.recv(1024)
+			peer.send(RESPONSE, 0)
 			peer.close
 		end
 	end

benchmark/server/gems.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "async"

benchmark/server/scheduler.rb

@@ -15,8 +15,7 @@ class Scheduler
 	def initialize(selector = nil)
 		@fiber = Fiber.current
 		@selector = selector || IO::Event::Selector.new(@fiber)
-		@pending = []
-		@waiting = {}
+		@waiting = 0
 
 		unless @selector.respond_to?(:io_close)
 			instance_eval{undef io_close}
@@ -35,10 +34,10 @@ def unblock(blocker, fiber)
 
 	def io_wait(io, events, timeout)
 		fiber = Fiber.current
-		@waiting[fiber] = io
+		@waiting += 1
 		@selector.io_wait(fiber, io, events)
 	ensure
-		@waiting.delete(fiber)
+		@waiting -= 1
 	end
 
 	def io_close(io)
@@ -50,7 +49,7 @@ def kernel_sleep(duration)
 	end
 
 	def close
-		while @selector.ready? || @waiting.any?
+		while @selector.ready? || @waiting > 0
 			begin
 				@selector.select(nil)
 			rescue Errno::EINTR
@@ -73,17 +72,17 @@ def fiber(&block)
 class DirectScheduler < Scheduler
 	def io_read(io, buffer, length)
 		fiber = Fiber.current
-		@waiting[fiber] = io
+		@waiting += 1
 		result = @selector.io_read(fiber, io, buffer, length)
 	ensure
-		@waiting.delete(fiber)
+		@waiting -= 1
 	end
 
 	def io_write(io, buffer, length)
 		fiber = Fiber.current
-		@waiting[fiber] = io
+		@waiting += 1
 		@selector.io_write(fiber, io, buffer, length)
 	ensure
-		@waiting.delete(fiber)
+		@waiting -= 1
 	end
 end

benchmark/server/thread.rb

@@ -6,6 +6,8 @@
 
 require "socket"
 
+RESPONSE = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n"
+
 port = Integer(ARGV.pop || 9090)
 server = TCPServer.new("localhost", port)
 
@@ -14,7 +16,7 @@
 
 	Thread.new do
 		peer.recv(1024)
-		peer.send("HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n", 0)
+		peer.send(RESPONSE, 0)
 		peer.close
 	end
 end