github/node-v0.x-archive
1
1
Fork 0
mirror of https://github.com/nodejs/node-v0.x-archive.git synced 2026-04-28 03:01:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

node: Do not use fn.apply() in process._makeCallback

Browse Source
This commit is contained in:
isaacs
2013-01-29 23:23:36 -08:00
parent f64d1febc8
commit 016810913d
2 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/node.cc
View File

@@ -908,6 +908,11 @@ MakeCallback(const Handle<Object> object,
Handle<Value> argv[]) { Handle<Value> argv[]) {
HandleScope scope; HandleScope scope;
if (argc > 6) {
fprintf(stderr, "node::MakeCallback - Too many args (%d)\n", argc);
abort();
}
Local<Value> callback_v = object->Get(symbol); Local<Value> callback_v = object->Get(symbol);
if (!callback_v->IsFunction()) { if (!callback_v->IsFunction()) {
String::Utf8Value method(symbol); String::Utf8Value method(symbol);
@@ -918,18 +923,6 @@ MakeCallback(const Handle<Object> object,
abort(); abort();
} }
Local<Function> callback = Local<Function>::Cast(callback_v);
return scope.Close(MakeCallback(object, callback, argc, argv));
}
Handle<Value>
MakeCallback(const Handle<Object> object,
const Handle<Function> callback,
int argc,
Handle<Value> argv[]) {
HandleScope scope;
// TODO Hook for long stack traces to be made here. // TODO Hook for long stack traces to be made here.
TryCatch try_catch; TryCatch try_catch;
@@ -950,9 +943,9 @@ MakeCallback(const Handle<Object> object,
} }
Local<Value> object_l = Local<Value>::New(node_isolate, object); Local<Value> object_l = Local<Value>::New(node_isolate, object);
Local<Value> callback_l = Local<Value>::New(node_isolate, callback); Local<Value> symbol_l = Local<Value>::New(node_isolate, symbol);
Local<Value> args[3] = { object_l, callback_l, argArray }; Local<Value> args[3] = { object_l, symbol_l, argArray };
Local<Value> ret = process_makeCallback->Call(process, ARRAY_SIZE(args), args); Local<Value> ret = process_makeCallback->Call(process, ARRAY_SIZE(args), args);

35
src/node.js
View File

@@ -296,6 +296,8 @@
}; };
startup.processMakeCallback = function() { startup.processMakeCallback = function() {
// Along with EventEmitter.emit, this is the hottest code in node.
// Everything that comes from C++ into JS passes through here.
process._makeCallback = function(obj, fn, args) { process._makeCallback = function(obj, fn, args) {
var domain = obj.domain; var domain = obj.domain;
if (domain) { if (domain) {
@@ -303,7 +305,38 @@
domain.enter(); domain.enter();
} }
var ret = fn.apply(obj, args); // I know what you're thinking, why not just use fn.apply
// Because we hit this function a lot, and really want to make sure
// that V8 can optimize it as well as possible.
var ret;
switch (args.length) {
case 0:
ret = obj[fn]();
break;
case 1:
ret = obj[fn](args[0]);
break;
case 2:
ret = obj[fn](args[0], args[1]);
break;
case 3:
ret = obj[fn](args[0], args[1], args[2]);
break;
case 4:
ret = obj[fn](args[0], args[1], args[2], args[3]);
break;
case 5:
ret = obj[fn](args[0], args[1], args[2], args[3], args[4]);
break;
case 6:
ret = obj[fn](args[0], args[1], args[2], args[3], args[4], args[5]);
break;
default:
// How did we even get here? This should abort() in C++ land!
throw new Error('too many args to makeCallback');
break;
}
if (domain) domain.exit(); if (domain) domain.exit();