Skip to content
Permalink
Browse files

Finally remove node::EventEmitter

  • Loading branch information...
ry committed Jul 19, 2011
1 parent 0a3fc1d commit 4ef8f06fe62edb74fded0e817266cb6398e69f36
Showing with 10 additions and 153 deletions.
  1. +3 −1 lib/events.js
  2. +0 −6 src/node.cc
  3. +7 −3 src/node.js
  4. +0 −92 src/node_events.cc
  5. +0 −44 src/node_events.h
  6. +0 −1 src/node_file.h
  7. +0 −2 src/node_signal_watcher.h
  8. +0 −1 src/node_stat_watcher.h
  9. +0 −1 src/node_stdio.cc
  10. +0 −2 wscript
@@ -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.
@@ -62,7 +62,6 @@ extern "C" {
# include <node_io_watcher.h>
#endif
#include <node_net.h>
#include <node_events.h>
#include <node_cares.h>
#include <node_file.h>
#include <node_http_parser.h>
@@ -2022,7 +2021,6 @@ Handle<Object> SetupProcessObject(int argc, char *argv[]) {
int i, j;

Local<FunctionTemplate> process_template = FunctionTemplate::New();
node::EventEmitter::Initialize(process_template);

process = Persistent<Object>::New(process_template->GetFunction()->NewInstance());

@@ -2147,10 +2145,6 @@ Handle<Object> 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;
}

@@ -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;

This file was deleted.

This file was deleted.

@@ -23,7 +23,6 @@
#define SRC_FILE_H_

#include <node.h>
#include <node_events.h>
#include <v8.h>

namespace node {
@@ -23,8 +23,6 @@
#define NODE_SIGNAL_WATCHER_H_

#include <node.h>
#include <node_events.h>

#include <v8.h>
#include <ev.h>

@@ -23,7 +23,6 @@
#define NODE_STAT_WATCHER_H_

#include <node.h>
#include <node_events.h>
#include <ev.h>

namespace node {
@@ -20,7 +20,6 @@
// USE OR OTHER DEALINGS IN THE SOFTWARE.

#include <node_stdio.h>
#include <node_events.h>

#include <unistd.h>
#include <fcntl.h>
@@ -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
""")

0 comments on commit 4ef8f06

Please sign in to comment.
You can’t perform that action at this time.