diff options
-rw-r--r-- | lib/rainbows.rb | 2 | ||||
-rw-r--r-- | lib/rainbows/http_server.rb | 2 | ||||
-rw-r--r-- | lib/rainbows/max_body.rb | 2 | ||||
-rw-r--r-- | lib/rainbows/xepoll.rb (renamed from lib/rainbows/xaccept_epoll.rb) | 4 | ||||
-rw-r--r-- | lib/rainbows/xepoll/client.rb (renamed from lib/rainbows/xaccept_epoll/client.rb) | 2 | ||||
-rw-r--r-- | t/GNUmakefile | 2 | ||||
-rw-r--r-- | t/simple-http_XEpoll.ru (renamed from t/simple-http_XAcceptEpoll.ru) | 2 | ||||
-rwxr-xr-x | t/t0113-rewindable-input-false.sh | 2 | ||||
-rwxr-xr-x | t/t0114-rewindable-input-true.sh | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/lib/rainbows.rb b/lib/rainbows.rb index 8271d25..fed0715 100644 --- a/lib/rainbows.rb +++ b/lib/rainbows.rb @@ -124,7 +124,7 @@ module Rainbows :CoolioThreadPool => 50, :CoolioFiberSpawn => 50, :Epoll => 50, - :XAcceptEpoll => 50, + :XEpoll => 50, :EventMachine => 50, :FiberSpawn => 50, :FiberPool => 50, diff --git a/lib/rainbows/http_server.rb b/lib/rainbows/http_server.rb index 91c6cad..236c379 100644 --- a/lib/rainbows/http_server.rb +++ b/lib/rainbows/http_server.rb @@ -72,7 +72,7 @@ class Rainbows::HttpServer < Unicorn::HttpServer new_defaults = { 'rainbows.model' => (@use = model.to_sym), 'rack.multithread' => !!(model.to_s =~ /Thread/), - 'rainbows.autochunk' => [:Coolio,:Rev,:Epoll,:XAcceptEpoll, + 'rainbows.autochunk' => [:Coolio,:Rev,:Epoll,:XEpoll, :EventMachine,:NeverBlock].include?(@use), } Rainbows::Const::RACK_DEFAULTS.update(new_defaults) diff --git a/lib/rainbows/max_body.rb b/lib/rainbows/max_body.rb index 68ae3e3..fba8b3c 100644 --- a/lib/rainbows/max_body.rb +++ b/lib/rainbows/max_body.rb @@ -56,7 +56,7 @@ class Rainbows::MaxBody when :Rev, :Coolio, :EventMachine, :NeverBlock, :RevThreadSpawn, :RevThreadPool, :CoolioThreadSpawn, :CoolioThreadPool, - :Epoll, :XAcceptEpoll + :Epoll, :XEpoll return end diff --git a/lib/rainbows/xaccept_epoll.rb b/lib/rainbows/xepoll.rb index 94ad332..3a02b46 100644 --- a/lib/rainbows/xaccept_epoll.rb +++ b/lib/rainbows/xepoll.rb @@ -7,9 +7,9 @@ require 'rainbows/epoll' # a (hopefully) native thread. This is recommended over Epoll for # Ruby 1.9 users as it can workaround accept()-scalability issues # on multicore machines. -module Rainbows::XAcceptEpoll +module Rainbows::XEpoll include Rainbows::Base - autoload :Client, 'rainbows/xaccept_epoll/client' + autoload :Client, 'rainbows/xepoll/client' def init_worker_process(worker) super diff --git a/lib/rainbows/xaccept_epoll/client.rb b/lib/rainbows/xepoll/client.rb index f0fecd0..fa5999b 100644 --- a/lib/rainbows/xaccept_epoll/client.rb +++ b/lib/rainbows/xepoll/client.rb @@ -1,7 +1,7 @@ # -*- encoding: binary -*- # :enddoc: -module Rainbows::XAcceptEpoll::Client +module Rainbows::XEpoll::Client include Rainbows::Epoll::Client MAX = Rainbows.server.worker_connections THRESH = MAX - 1 diff --git a/t/GNUmakefile b/t/GNUmakefile index 21b5154..07dfec9 100644 --- a/t/GNUmakefile +++ b/t/GNUmakefile @@ -20,7 +20,7 @@ RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))') export RUBY_VERSION RUBY_ENGINE ifeq (Linux,$(shell uname -s)) - models += XAcceptEpoll + models += XEpoll models += Epoll endif models += WriterThreadPool diff --git a/t/simple-http_XAcceptEpoll.ru b/t/simple-http_XEpoll.ru index fc0baa6..518099b 100644 --- a/t/simple-http_XAcceptEpoll.ru +++ b/t/simple-http_XEpoll.ru @@ -1,7 +1,7 @@ use Rack::ContentLength use Rack::ContentType run lambda { |env| - if env['rack.multithread'] == false && env['rainbows.model'] == :XAcceptEpoll + if env['rack.multithread'] == false && env['rainbows.model'] == :XEpoll [ 200, {}, [ Thread.current.inspect << "\n" ] ] else raise env.inspect diff --git a/t/t0113-rewindable-input-false.sh b/t/t0113-rewindable-input-false.sh index 1119dbf..6eb2fda 100755 --- a/t/t0113-rewindable-input-false.sh +++ b/t/t0113-rewindable-input-false.sh @@ -3,7 +3,7 @@ skip_models EventMachine NeverBlock skip_models Rev RevThreadSpawn RevThreadPool skip_models Coolio CoolioThreadSpawn CoolioThreadPool -skip_models Epoll XAcceptEpoll +skip_models Epoll XEpoll t_plan 4 "rewindable_input toggled to false" diff --git a/t/t0114-rewindable-input-true.sh b/t/t0114-rewindable-input-true.sh index f4ef796..9d256dc 100755 --- a/t/t0114-rewindable-input-true.sh +++ b/t/t0114-rewindable-input-true.sh @@ -3,7 +3,7 @@ skip_models EventMachine NeverBlock skip_models Rev RevThreadSpawn RevThreadPool skip_models Coolio CoolioThreadSpawn CoolioThreadPool -skip_models Epoll XAcceptEpoll +skip_models Epoll XEpoll t_plan 4 "rewindable_input toggled to true" |