diff --git a/benchmark/http_simple.rb b/benchmark/http_simple.rb index d1176e5abe..ee33f57f1d 100644 --- a/benchmark/http_simple.rb +++ b/benchmark/http_simple.rb @@ -86,12 +86,10 @@ end if $0 == __FILE__ #require DIR + '/../lib/ebb' require 'rubygems' -# require 'rack' -# Rack::Handler::Mongrel.run(SimpleApp.new, :Port => 8000) - + require 'rack' require 'thin' + require 'ebb' +# Rack::Handler::Mongrel.run(SimpleApp.new, :Port => 8000) Thin::Server.start("0.0.0.0", 8000, SimpleApp.new) - -# require 'ebb' # Ebb::start_server(SimpleApp.new, :port => 8000) end diff --git a/src/node.cc b/src/node.cc index 205c8aeab5..11c6a7de8e 100644 --- a/src/node.cc +++ b/src/node.cc @@ -1240,12 +1240,10 @@ int main(int argc, char *argv[]) { evcom_ignore_sigpipe(); // Initialize the default ev loop. -#if defined(__sun) +#ifdef __sun // TODO(Ryan) I'm experiencing abnormally high load using Solaris's // EVBACKEND_PORT. Temporarally forcing select() until I debug. ev_default_loop(EVBACKEND_SELECT); -#elif defined(__APPLE__) - ev_default_loop(EVBACKEND_KQUEUE); #else ev_default_loop(EVFLAG_AUTO); #endif