From 4ef8f06fe62edb74fded0e817266cb6398e69f36 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Tue, 19 Jul 2011 01:46:38 -0700 Subject: [PATCH] Finally remove node::EventEmitter --- lib/events.js | 4 ++- src/node.cc | 6 ---- src/node.js | 10 ++++-- src/node_events.cc | 92 ----------------------------------------------- src/node_events.h | 44 ----------------------- src/node_file.h | 1 - src/node_signal_watcher.h | 2 -- src/node_stat_watcher.h | 1 - src/node_stdio.cc | 1 - wscript | 2 -- 10 files changed, 10 insertions(+), 153 deletions(-) delete mode 100644 src/node_events.cc delete mode 100644 src/node_events.h diff --git a/lib/events.js b/lib/events.js index a7daaa2..675693f 100644 --- a/lib/events.js +++ b/lib/events.js @@ -19,9 +19,11 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -var EventEmitter = exports.EventEmitter = process.EventEmitter; var isArray = Array.isArray; +function EventEmitter() { } +exports.EventEmitter = EventEmitter; + // By default EventEmitters will print a warning if more than // 10 listeners are added to it. This is a useful default which // helps finding memory leaks. diff --git a/src/node.cc b/src/node.cc index aca5f6a..4f59762 100644 --- a/src/node.cc +++ b/src/node.cc @@ -62,7 +62,6 @@ extern "C" { # include #endif #include -#include #include #include #include @@ -2022,7 +2021,6 @@ Handle SetupProcessObject(int argc, char *argv[]) { int i, j; Local process_template = FunctionTemplate::New(); - node::EventEmitter::Initialize(process_template); process = Persistent::New(process_template->GetFunction()->NewInstance()); @@ -2147,10 +2145,6 @@ Handle SetupProcessObject(int argc, char *argv[]) { NODE_SET_METHOD(process, "binding", Binding); - // Assign the EventEmitter. It was created in main(). - process->Set(String::NewSymbol("EventEmitter"), - EventEmitter::constructor_template->GetFunction()); - return process; } diff --git a/src/node.js b/src/node.js index e4a9de4..c733555 100644 --- a/src/node.js +++ b/src/node.js @@ -27,10 +27,16 @@ (function(process) { global = this; + var EventEmitter; + function startup() { if (process.env.NODE_USE_UV == '1') process.useUV = true; + EventEmitter = NativeModule.require('events').EventEmitter; + process.__proto__ = EventEmitter.prototype; + process.EventEmitter = EventEmitter; // process.EventEmitter is deprecated + startup.globalVariables(); startup.globalTimeouts(); startup.globalConsole(); @@ -226,8 +232,7 @@ // process.stderr - var events = NativeModule.require('events'); - var stderr = process.stderr = new events.EventEmitter(); + var stderr = process.stderr = new EventEmitter(); stderr.writable = true; stderr.readable = false; stderr.write = process.binding('stdio').writeError; @@ -276,7 +281,6 @@ startup.processSignalHandlers = function() { // Load events module in order to access prototype elements on process like // process.addListener. - var events = NativeModule.require('events'); var signalWatchers = {}; var addListener = process.addListener; var removeListener = process.removeListener; diff --git a/src/node_events.cc b/src/node_events.cc deleted file mode 100644 index 8c0b5a6..0000000 --- a/src/node_events.cc +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright Joyent, Inc. and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - -#include -#include - -namespace node { - -using namespace v8; - -Persistent EventEmitter::constructor_template; - -static Persistent events_symbol; - -void EventEmitter::Initialize(Local ctemplate) { - HandleScope scope; - - constructor_template = Persistent::New(ctemplate); - - constructor_template->SetClassName(String::NewSymbol("EventEmitter")); - - events_symbol = NODE_PSYMBOL("_events"); - - // All other prototype methods are defined in events.js -} - - -bool EventEmitter::Emit(Handle event, int argc, Handle argv[]) { - HandleScope scope; - // HandleScope not needed here because only called from one of the two - // functions below - Local events_v = handle_->Get(events_symbol); - if (!events_v->IsObject()) return false; - Local events = events_v->ToObject(); - - Local listeners_v = events->Get(event); - - TryCatch try_catch; - - if (listeners_v->IsFunction()) { - // Optimized one-listener case - Local listener = Local::Cast(listeners_v); - - listener->Call(handle_, argc, argv); - - if (try_catch.HasCaught()) { - FatalException(try_catch); - return false; - } - - } else if (listeners_v->IsArray()) { - Local listeners = Local::Cast(listeners_v->ToObject()->Clone()); - - for (uint32_t i = 0; i < listeners->Length(); i++) { - Local listener_v = listeners->Get(i); - if (!listener_v->IsFunction()) continue; - Local listener = Local::Cast(listener_v); - - listener->Call(handle_, argc, argv); - - if (try_catch.HasCaught()) { - FatalException(try_catch); - return false; - } - } - - } else { - return false; - } - - return true; -} - -} // namespace node diff --git a/src/node_events.h b/src/node_events.h deleted file mode 100644 index fc87189..0000000 --- a/src/node_events.h +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright Joyent, Inc. and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - -#ifndef SRC_EVENTS_H_ -#define SRC_EVENTS_H_ - -#include -#include - -namespace node { - -class EventEmitter : public ObjectWrap { - public: - static void Initialize(v8::Local ctemplate); - static v8::Persistent constructor_template; - - bool Emit(v8::Handle event, - int argc, - v8::Handle argv[]); - - protected: - EventEmitter() : ObjectWrap () { } -}; - -} // namespace node -#endif // SRC_EVENTS_H_ diff --git a/src/node_file.h b/src/node_file.h index 6ac5a31..e98b115 100644 --- a/src/node_file.h +++ b/src/node_file.h @@ -23,7 +23,6 @@ #define SRC_FILE_H_ #include -#include #include namespace node { diff --git a/src/node_signal_watcher.h b/src/node_signal_watcher.h index 9c14967..d2ced70 100644 --- a/src/node_signal_watcher.h +++ b/src/node_signal_watcher.h @@ -23,8 +23,6 @@ #define NODE_SIGNAL_WATCHER_H_ #include -#include - #include #include diff --git a/src/node_stat_watcher.h b/src/node_stat_watcher.h index f88caef..50e86c8 100644 --- a/src/node_stat_watcher.h +++ b/src/node_stat_watcher.h @@ -23,7 +23,6 @@ #define NODE_STAT_WATCHER_H_ #include -#include #include namespace node { diff --git a/src/node_stdio.cc b/src/node_stdio.cc index f654d2b..2668bb0 100644 --- a/src/node_stdio.cc +++ b/src/node_stdio.cc @@ -20,7 +20,6 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. #include -#include #include #include diff --git a/wscript b/wscript index 65ee411..e354e78 100644 --- a/wscript +++ b/wscript @@ -839,7 +839,6 @@ def build(bld): src/node_extensions.cc src/node_http_parser.cc src/node_constants.cc - src/node_events.cc src/node_file.cc src/node_script.cc src/node_os.cc @@ -927,7 +926,6 @@ def build(bld): src/node.h src/node_object_wrap.h src/node_buffer.h - src/node_events.h src/node_version.h """) -- 2.7.4