From 6d60d2db00d25b385bd978ea074486651ae10c50 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Fri, 5 Mar 2010 14:36:13 -0800 Subject: [PATCH] Revert "Use kqueue on macintosh" Experiencing bugs http://github.com/ry/node/issues/#issue/74 This reverts commit 409020a67d3388e4eda90af546e0fbe25b0adec3. --- benchmark/http_simple.rb | 8 +++----- src/node.cc | 4 +--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/benchmark/http_simple.rb b/benchmark/http_simple.rb index d1176e5abee..ee33f57f1db 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 205c8aeab52..11c6a7de8e0 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