Add process.moduleLoadList for better startup transparency
This commit is contained in:
parent
bca6e35b2b
commit
ea9ee1fb7e
15
src/node.cc
15
src/node.cc
@ -1860,6 +1860,7 @@ static void DebugBreakMessageHandler(const Debug::Message& message) {
|
|||||||
|
|
||||||
|
|
||||||
Persistent<Object> binding_cache;
|
Persistent<Object> binding_cache;
|
||||||
|
Persistent<Array> module_load_list;
|
||||||
|
|
||||||
static Handle<Value> Binding(const Arguments& args) {
|
static Handle<Value> Binding(const Arguments& args) {
|
||||||
HandleScope scope;
|
HandleScope scope;
|
||||||
@ -1876,8 +1877,16 @@ static Handle<Value> Binding(const Arguments& args) {
|
|||||||
|
|
||||||
if (binding_cache->Has(module)) {
|
if (binding_cache->Has(module)) {
|
||||||
exports = binding_cache->Get(module)->ToObject();
|
exports = binding_cache->Get(module)->ToObject();
|
||||||
|
return scope.Close(exports);
|
||||||
|
}
|
||||||
|
|
||||||
} else if ((modp = get_builtin_module(*module_v)) != NULL) {
|
// Append a string to process.moduleLoadList
|
||||||
|
char buf[1024];
|
||||||
|
snprintf(buf, 1024, "Binding %s", *module_v);
|
||||||
|
uint32_t l = module_load_list->Length();
|
||||||
|
module_load_list->Set(l, String::New(buf));
|
||||||
|
|
||||||
|
if ((modp = get_builtin_module(*module_v)) != NULL) {
|
||||||
exports = Object::New();
|
exports = Object::New();
|
||||||
modp->register_func(exports);
|
modp->register_func(exports);
|
||||||
binding_cache->Set(module, exports);
|
binding_cache->Set(module, exports);
|
||||||
@ -2049,6 +2058,10 @@ Handle<Object> SetupProcessObject(int argc, char *argv[]) {
|
|||||||
// process.installPrefix
|
// process.installPrefix
|
||||||
process->Set(String::NewSymbol("installPrefix"), String::New(NODE_PREFIX));
|
process->Set(String::NewSymbol("installPrefix"), String::New(NODE_PREFIX));
|
||||||
|
|
||||||
|
// process.moduleLoadList
|
||||||
|
module_load_list = Persistent<Array>::New(Array::New());
|
||||||
|
process->Set(String::NewSymbol("moduleLoadList"), module_load_list);
|
||||||
|
|
||||||
Local<Object> versions = Object::New();
|
Local<Object> versions = Object::New();
|
||||||
char buf[20];
|
char buf[20];
|
||||||
process->Set(String::NewSymbol("versions"), versions);
|
process->Set(String::NewSymbol("versions"), versions);
|
||||||
|
@ -449,6 +449,8 @@
|
|||||||
throw new Error('No such native module ' + id);
|
throw new Error('No such native module ' + id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
process.moduleLoadList.push("NativeModule " + id);
|
||||||
|
|
||||||
var nativeModule = new NativeModule(id);
|
var nativeModule = new NativeModule(id);
|
||||||
|
|
||||||
nativeModule.compile();
|
nativeModule.compile();
|
||||||
|
79
test/simple/test-module-load-list.js
Normal file
79
test/simple/test-module-load-list.js
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
// This test makes assertions about exactly which modules and bindings are
|
||||||
|
// loaded at startup time. We explicitly do NOT load ../common.js or at the
|
||||||
|
// beginning of this file.
|
||||||
|
|
||||||
|
function assertEqual(x, y) {
|
||||||
|
if (x !== y) throw new Error("Expected '" + x + "' got '" + y + "'");
|
||||||
|
}
|
||||||
|
|
||||||
|
function checkExpected() {
|
||||||
|
assertEqual(expected.length, process.moduleLoadList.length);
|
||||||
|
|
||||||
|
for (var i = 0; i < expected.length; i++) {
|
||||||
|
assertEqual(expected[i], process.moduleLoadList[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var expected = [
|
||||||
|
'Binding evals',
|
||||||
|
'Binding natives',
|
||||||
|
'NativeModule events',
|
||||||
|
'NativeModule buffer',
|
||||||
|
'Binding buffer',
|
||||||
|
'NativeModule buffer_ieee754', // FIXME should not be loading
|
||||||
|
'NativeModule assert',
|
||||||
|
'NativeModule util',
|
||||||
|
'Binding stdio',
|
||||||
|
'NativeModule path',
|
||||||
|
'NativeModule module',
|
||||||
|
'NativeModule fs',
|
||||||
|
'Binding fs',
|
||||||
|
'Binding constants',
|
||||||
|
'NativeModule stream'
|
||||||
|
];
|
||||||
|
|
||||||
|
checkExpected();
|
||||||
|
|
||||||
|
|
||||||
|
// Now do the test again after we console.log something.
|
||||||
|
console.log("load console.log");
|
||||||
|
|
||||||
|
expected = expected.concat([
|
||||||
|
'NativeModule console',
|
||||||
|
'NativeModule net_legacy',
|
||||||
|
'NativeModule timers_legacy',
|
||||||
|
'Binding timer',
|
||||||
|
'NativeModule _linklist',
|
||||||
|
'Binding net',
|
||||||
|
'NativeModule freelist',
|
||||||
|
'Binding io_watcher',
|
||||||
|
'NativeModule tty',
|
||||||
|
'NativeModule tty_posix', // FIXME branch on win32 here.
|
||||||
|
'NativeModule child_process', // FIXME should not be loading
|
||||||
|
'Binding child_process' // FIXME should not be loading
|
||||||
|
]);
|
||||||
|
|
||||||
|
checkExpected();
|
||||||
|
|
||||||
|
console.log(process.moduleLoadList);
|
Loading…
x
Reference in New Issue
Block a user