Browse Source

Revert "Use kqueue on macintosh"

Experiencing bugs http://github.com/ry/node/issues/#issue/74

This reverts commit 409020a67d.
v0.7.4-release
Ryan Dahl 15 years ago
parent
commit
6d60d2db00
  1. 8
      benchmark/http_simple.rb
  2. 4
      src/node.cc

8
benchmark/http_simple.rb

@ -86,12 +86,10 @@ end
if $0 == __FILE__ if $0 == __FILE__
#require DIR + '/../lib/ebb' #require DIR + '/../lib/ebb'
require 'rubygems' require 'rubygems'
# require 'rack' require 'rack'
# Rack::Handler::Mongrel.run(SimpleApp.new, :Port => 8000)
require 'thin' require 'thin'
require 'ebb'
# Rack::Handler::Mongrel.run(SimpleApp.new, :Port => 8000)
Thin::Server.start("0.0.0.0", 8000, SimpleApp.new) Thin::Server.start("0.0.0.0", 8000, SimpleApp.new)
# require 'ebb'
# Ebb::start_server(SimpleApp.new, :port => 8000) # Ebb::start_server(SimpleApp.new, :port => 8000)
end end

4
src/node.cc

@ -1240,12 +1240,10 @@ int main(int argc, char *argv[]) {
evcom_ignore_sigpipe(); evcom_ignore_sigpipe();
// Initialize the default ev loop. // Initialize the default ev loop.
#if defined(__sun) #ifdef __sun
// TODO(Ryan) I'm experiencing abnormally high load using Solaris's // TODO(Ryan) I'm experiencing abnormally high load using Solaris's
// EVBACKEND_PORT. Temporarally forcing select() until I debug. // EVBACKEND_PORT. Temporarally forcing select() until I debug.
ev_default_loop(EVBACKEND_SELECT); ev_default_loop(EVBACKEND_SELECT);
#elif defined(__APPLE__)
ev_default_loop(EVBACKEND_KQUEUE);
#else #else
ev_default_loop(EVFLAG_AUTO); ev_default_loop(EVFLAG_AUTO);
#endif #endif

Loading…
Cancel
Save