'src/node_buffer.cc',
'src/node_constants.cc',
'src/node_contextify.cc',
- 'src/node_extensions.cc',
'src/node_file.cc',
'src/node_http_parser.cc',
'src/node_javascript.cc',
'src/node_buffer.h',
'src/node_constants.h',
'src/node_contextify.h',
- 'src/node_extensions.h',
'src/node_file.h',
'src/node_http_parser.h',
'src/node_internals.h',
} // namespace cares_wrap
} // namespace node
-NODE_MODULE_CONTEXT_AWARE(node_cares_wrap, node::cares_wrap::Initialize)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(cares_wrap, node::cares_wrap::Initialize)
} // namespace node
-NODE_MODULE_CONTEXT_AWARE(node_fs_event_wrap, node::FSEventWrap::Initialize)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(fs_event_wrap, node::FSEventWrap::Initialize)
static bool debug_wait_connect = false;
static int debug_port = 5858;
static bool v8_is_profiling = false;
+static node_module* modpending;
+static node_module* modlist_builtin;
+static node_module* modlist_addon;
// used by C++ modules as well
bool no_deprecation = false;
args.GetReturnValue().Set(tuple);
}
+extern "C" void node_module_register(void* m) {
+ struct node_module* mp = reinterpret_cast<struct node_module*>(m);
+
+ if (mp->nm_flags & NM_F_BUILTIN) {
+ mp->nm_link = modlist_builtin;
+ modlist_builtin = mp;
+ } else {
+ assert(modpending == NULL);
+ modpending = mp;
+ }
+}
+
+struct node_module* get_builtin_module(const char* name) {
+ struct node_module* mp;
+
+ for (mp = modlist_builtin; mp != NULL; mp = mp->nm_link) {
+ if (strcmp(mp->nm_modname, name) == 0)
+ break;
+ }
+
+ assert(mp == NULL || (mp->nm_flags & NM_F_BUILTIN) != 0);
+ return (mp);
+}
typedef void (UV_DYNAMIC* extInit)(Handle<Object> exports);
void DLOpen(const FunctionCallbackInfo<Value>& args) {
HandleScope handle_scope(args.GetIsolate());
Environment* env = Environment::GetCurrent(args.GetIsolate());
- char symbol[1024], *base, *pos;
+ struct node_module* mp;
uv_lib_t lib;
- int r;
if (args.Length() < 2) {
- return ThrowError("process.dlopen takes exactly 2 arguments.");
+ ThrowError("process.dlopen takes exactly 2 arguments.");
+ return;
}
Local<Object> module = args[0]->ToObject(); // Cast
return;
}
- String::Utf8Value path(args[1]);
- base = *path;
-
- /* Find the shared library filename within the full path. */
-#ifdef __POSIX__
- pos = strrchr(base, '/');
- if (pos != NULL) {
- base = pos + 1;
- }
-#else // Windows
- for (;;) {
- pos = strpbrk(base, "\\/:");
- if (pos == NULL) {
- break;
- }
- base = pos + 1;
- }
-#endif // __POSIX__
-
- /* Strip the .node extension. */
- pos = strrchr(base, '.');
- if (pos != NULL) {
- *pos = '\0';
- }
-
- /* Add the `_module` suffix to the extension name. */
- r = snprintf(symbol, sizeof symbol, "%s_module", base);
- if (r <= 0 || static_cast<size_t>(r) >= sizeof symbol) {
- return ThrowError("Out of memory.");
- }
-
- /* Replace dashes with underscores. When loading foo-bar.node,
- * look for foo_bar_module, not foo-bar_module.
+ /*
+ * Objects containing v14 or later modules will have registered themselves
+ * on the pending list. Activate all of them now. At present, only one
+ * module per object is supported.
*/
- for (pos = symbol; *pos != '\0'; ++pos) {
- if (*pos == '-')
- *pos = '_';
- }
+ mp = modpending;
+ modpending = NULL;
- node_module_struct *mod;
- if (uv_dlsym(&lib, symbol, reinterpret_cast<void**>(&mod))) {
- char errmsg[1024];
- snprintf(errmsg, sizeof(errmsg), "Symbol %s not found.", symbol);
- return ThrowError(errmsg);
+ if (mp == NULL) {
+ ThrowError("Module did not self-register.");
+ return;
}
-
- if (mod->version != NODE_MODULE_VERSION) {
+ if (mp->nm_version != NODE_MODULE_VERSION) {
char errmsg[1024];
snprintf(errmsg,
sizeof(errmsg),
"Module version mismatch. Expected %d, got %d.",
- NODE_MODULE_VERSION, mod->version);
- return ThrowError(errmsg);
+ NODE_MODULE_VERSION, mp->nm_version);
+ ThrowError(errmsg);
+ return;
+ }
+ if (mp->nm_flags & NM_F_BUILTIN) {
+ ThrowError("Built-in module self-registered.");
+ return;
}
- // Execute the C++ module
- if (mod->register_context_func != NULL) {
- mod->register_context_func(exports, module, env->context());
- } else if (mod->register_func != NULL) {
- mod->register_func(exports, module);
+ mp->nm_dso_handle = lib.handle;
+ mp->nm_link = modlist_addon;
+ modlist_addon = mp;
+
+ if (mp->nm_context_register_func != NULL) {
+ mp->nm_context_register_func(exports, module, env->context(), mp->nm_priv);
+ } else if (mp->nm_register_func != NULL) {
+ mp->nm_register_func(exports, module, mp->nm_priv);
} else {
- return ThrowError("Module has no declared entry point.");
+ ThrowError("Module has no declared entry point.");
+ return;
}
// Tell coverity that 'handle' should not be freed when we return.
uint32_t l = modules->Length();
modules->Set(l, OneByteString(node_isolate, buf));
- node_module_struct* mod = get_builtin_module(*module_v);
+ node_module* mod = get_builtin_module(*module_v);
if (mod != NULL) {
exports = Object::New();
// Internal bindings don't have a "module" object, only exports.
- assert(mod->register_func == NULL);
- assert(mod->register_context_func != NULL);
+ assert(mod->nm_register_func == NULL);
+ assert(mod->nm_context_register_func != NULL);
Local<Value> unused = Undefined(env->isolate());
- mod->register_context_func(exports, unused, env->context());
+ mod->nm_context_register_func(exports, unused,
+ env->context(), mod->nm_priv);
cache->Set(module, exports);
} else if (!strcmp(*module_v, "constants")) {
exports = Object::New();
typedef void (*addon_register_func)(
v8::Handle<v8::Object> exports,
- v8::Handle<v8::Value> module);
+ v8::Handle<v8::Value> module,
+ void* priv);
typedef void (*addon_context_register_func)(
v8::Handle<v8::Object> exports,
v8::Handle<v8::Value> module,
- v8::Handle<v8::Context> context);
-
-struct node_module_struct {
- int version;
- void *dso_handle;
- const char *filename;
- node::addon_register_func register_func;
- node::addon_context_register_func register_context_func;
- const char *modname;
+ v8::Handle<v8::Context> context,
+ void* priv);
+
+#define NM_F_BUILTIN 0x01
+
+struct node_module {
+ int nm_version;
+ unsigned int nm_flags;
+ void* nm_dso_handle;
+ const char* nm_filename;
+ node::addon_register_func nm_register_func;
+ node::addon_context_register_func nm_context_register_func;
+ const char* nm_modname;
+ void* nm_priv;
+ struct node_module* nm_link;
};
-node_module_struct* get_builtin_module(const char *name);
+node_module* get_builtin_module(const char *name);
-#define NODE_STANDARD_MODULE_STUFF \
- NODE_MODULE_VERSION, \
- NULL, \
- __FILE__
+extern "C" NODE_EXTERN void node_module_register(void* mod);
#ifdef _WIN32
# define NODE_MODULE_EXPORT __declspec(dllexport)
# define NODE_MODULE_EXPORT /* empty */
#endif
-#define NODE_MODULE(modname, regfunc) \
+#if defined(_MSC_VER)
+#pragma section(".CRT$XCU", read)
+#define NODE_C_CTOR(fn) \
+ static void __cdecl fn(void); \
+ __declspec(allocate(".CRT$XCU")) static void (__cdecl*fn ## _)(void) = fn; \
+ static void __cdecl fn(void)
+#else
+#define NODE_C_CTOR(fn) \
+ static void fn(void) __attribute__((constructor)); \
+ static void fn(void)
+#endif
+
+#define NODE_MODULE_X(modstr, regfunc, priv, flags) \
extern "C" { \
- NODE_MODULE_EXPORT node::node_module_struct modname ## _module = \
+ static node::node_module _module = \
{ \
- NODE_STANDARD_MODULE_STUFF, \
+ NODE_MODULE_VERSION, \
+ flags, \
+ NULL, \
+ __FILE__, \
(node::addon_register_func) (regfunc), \
NULL, \
- NODE_STRINGIFY(modname) \
+ modstr, \
+ priv, \
+ NULL \
}; \
+ NODE_C_CTOR(_register) { \
+ node_module_register(&_module); \
+ } \
}
-#define NODE_MODULE_CONTEXT_AWARE(modname, regfunc) \
+#define NODE_MODULE_CONTEXT_AWARE_X(modstr, regfunc, priv, flags) \
extern "C" { \
- NODE_MODULE_EXPORT node::node_module_struct modname ## _module = \
+ static node::node_module _module = \
{ \
- NODE_STANDARD_MODULE_STUFF, \
+ NODE_MODULE_VERSION, \
+ flags, \
NULL, \
- (regfunc), \
- NODE_STRINGIFY(modname) \
+ __FILE__, \
+ NULL, \
+ (node::addon_context_register_func) (regfunc), \
+ modstr, \
+ priv, \
+ NULL \
}; \
+ NODE_C_CTOR(_register) { \
+ node_module_register(&_module); \
+ } \
}
-#define NODE_MODULE_DECL(modname) \
- extern "C" node::node_module_struct modname ## _module;
+#define NODE_MODULE(modname, regfunc) \
+ NODE_MODULE_X(NODE_STRINGIFY(modname), regfunc, NULL, 0)
+
+#define NODE_MODULE_CONTEXT_AWARE(modname, regfunc) \
+ NODE_MODULE_CONTEXT_AWARE_X(NODE_STRINGIFY(modname), regfunc, NULL, 0)
+
+#define NODE_MODULE_CONTEXT_AWARE_BUILTIN(modname, regfunc) \
+ NODE_MODULE_CONTEXT_AWARE_X(NODE_STRINGIFY(modname), \
+ regfunc, NULL, NM_F_BUILTIN)
+
+/*
+ * For backward compatibility in add-on modules.
+ */
+#define NODE_MODULE_DECL /* nothing */
/* Called after the event loop exits but before the VM is disposed.
* Callbacks are run in reverse order of registration, i.e. newest first.
} // namespace Buffer
} // namespace node
-NODE_MODULE_CONTEXT_AWARE(node_buffer, node::Buffer::Initialize)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(buffer, node::Buffer::Initialize)
} // namespace node
-NODE_MODULE_CONTEXT_AWARE(node_contextify, node::InitContextify);
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(contextify, node::InitContextify);
// FIXME(bnoordhuis) Handle global init correctly.
void InitCrypto(Handle<Object> target,
Handle<Value> unused,
- Handle<Context> context) {
+ Handle<Context> context,
+ void* priv) {
static uv_once_t init_once = UV_ONCE_INIT;
uv_once(&init_once, InitCryptoOnce);
} // namespace crypto
} // namespace node
-NODE_MODULE_CONTEXT_AWARE(node_crypto, node::crypto::InitCrypto)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(crypto, node::crypto::InitCrypto)
+++ /dev/null
-// 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 "node.h"
-#include "node_version.h"
-#include "node_extensions.h"
-#include <string.h>
-#include <stdio.h>
-
-#undef NODE_EXT_LIST_START
-#undef NODE_EXT_LIST_ITEM
-#undef NODE_EXT_LIST_END
-
-#define NODE_EXT_LIST_START
-#define NODE_EXT_LIST_ITEM NODE_MODULE_DECL
-#define NODE_EXT_LIST_END
-
-NODE_EXT_LIST(NODE_EXT_LIST_START, NODE_EXT_LIST_ITEM, NODE_EXT_LIST_END)
-
-#undef NODE_EXT_LIST_START
-#undef NODE_EXT_LIST_ITEM
-#undef NODE_EXT_LIST_END
-
-#define NODE_EXT_STRING(x) &x ## _module,
-#define NODE_EXT_LIST_START node::node_module_struct *node_module_list[] = {
-#define NODE_EXT_LIST_ITEM NODE_EXT_STRING
-#define NODE_EXT_LIST_END NULL};
-
-NODE_EXT_LIST(NODE_EXT_LIST_START, NODE_EXT_LIST_ITEM, NODE_EXT_LIST_END)
-
-namespace node {
-
-node_module_struct* get_builtin_module(const char *name) {
- char buf[128];
- node_module_struct *cur = NULL;
- snprintf(buf, sizeof(buf), "node_%s", name);
- /* TODO: you could look these up in a hash, but there are only
- * a few, and once loaded they are cached. */
- for (int i = 0; node_module_list[i] != NULL; i++) {
- cur = node_module_list[i];
- if (strcmp(cur->modname, buf) == 0) {
- return cur;
- }
- }
-
- return NULL;
-}
-
-} // namespace node
+++ /dev/null
-// 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_NODE_EXTENSIONS_H_
-#define SRC_NODE_EXTENSIONS_H_
-
-#if HAVE_OPENSSL
-# define NODE_EXT_LIST_SSL(ITEM) \
- ITEM(node_crypto) \
- ITEM(node_tls_wrap)
-#else
-# define NODE_EXT_LIST_SSL(ITEM)
-#endif // HAVE_OPENSSL
-
-#define NODE_EXT_LIST(START, ITEM, END) \
- START \
- ITEM(node_buffer) \
- NODE_EXT_LIST_SSL(ITEM) \
- ITEM(node_contextify) \
- ITEM(node_fs) \
- ITEM(node_http_parser) \
- ITEM(node_os) \
- ITEM(node_smalloc) \
- ITEM(node_zlib) \
- \
- ITEM(node_uv) \
- ITEM(node_timer_wrap) \
- ITEM(node_tcp_wrap) \
- ITEM(node_udp_wrap) \
- ITEM(node_pipe_wrap) \
- ITEM(node_cares_wrap) \
- ITEM(node_tty_wrap) \
- ITEM(node_process_wrap) \
- ITEM(node_fs_event_wrap) \
- ITEM(node_signal_wrap) \
- \
- END \
-
-#endif // SRC_NODE_EXTENSIONS_H_
void InitFs(Handle<Object> target,
Handle<Value> unused,
- Handle<Context> context) {
+ Handle<Context> context,
+ void* priv) {
Environment* env = Environment::GetCurrent(context);
// Initialize the stats object
} // end namespace node
-NODE_MODULE_CONTEXT_AWARE(node_fs, node::InitFs)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(fs, node::InitFs)
void InitHttpParser(Handle<Object> target,
Handle<Value> unused,
- Handle<Context> context) {
+ Handle<Context> context,
+ void* priv) {
Local<FunctionTemplate> t = FunctionTemplate::New(Parser::New);
t->InstanceTemplate()->SetInternalFieldCount(1);
t->SetClassName(FIXED_ONE_BYTE_STRING(node_isolate, "HTTPParser"));
} // namespace node
-NODE_MODULE_CONTEXT_AWARE(node_http_parser, node::InitHttpParser)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(http_parser, node::InitHttpParser)
} // namespace os
} // namespace node
-NODE_MODULE_CONTEXT_AWARE(node_os, node::os::Initialize)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(os, node::os::Initialize)
* an API is broken in the C++ side, including in v8 or
* other dependencies.
*/
-#define NODE_MODULE_VERSION 13 /* v0.12 */
+#define NODE_MODULE_VERSION 14 /* v0.12 */
#endif /* SRC_NODE_VERSION_H_ */
void InitZlib(Handle<Object> target,
Handle<Value> unused,
- Handle<Context> context) {
+ Handle<Context> context,
+ void* priv) {
Local<FunctionTemplate> z = FunctionTemplate::New(ZCtx::New);
z->InstanceTemplate()->SetInternalFieldCount(1);
} // namespace node
-NODE_MODULE_CONTEXT_AWARE(node_zlib, node::InitZlib)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(zlib, node::InitZlib)
} // namespace node
-NODE_MODULE_CONTEXT_AWARE(node_pipe_wrap, node::PipeWrap::Initialize)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(pipe_wrap, node::PipeWrap::Initialize)
} // namespace node
-NODE_MODULE_CONTEXT_AWARE(node_process_wrap, node::ProcessWrap::Initialize)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(process_wrap, node::ProcessWrap::Initialize)
} // namespace node
-NODE_MODULE_CONTEXT_AWARE(node_signal_wrap, node::SignalWrap::Initialize)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(signal_wrap, node::SignalWrap::Initialize)
} // namespace smalloc
} // namespace node
-NODE_MODULE_CONTEXT_AWARE(node_smalloc, node::smalloc::Initialize)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(smalloc, node::smalloc::Initialize)
} // namespace node
-NODE_MODULE_CONTEXT_AWARE(node_tcp_wrap, node::TCPWrap::Initialize)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(tcp_wrap, node::TCPWrap::Initialize)
} // namespace node
-NODE_MODULE_CONTEXT_AWARE(node_timer_wrap, node::TimerWrap::Initialize)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(timer_wrap, node::TimerWrap::Initialize)
} // namespace node
-NODE_MODULE_CONTEXT_AWARE(node_tls_wrap, node::TLSCallbacks::Initialize)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(tls_wrap, node::TLSCallbacks::Initialize)
} // namespace node
-NODE_MODULE_CONTEXT_AWARE(node_tty_wrap, node::TTYWrap::Initialize)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(tty_wrap, node::TTYWrap::Initialize)
} // namespace node
-NODE_MODULE_CONTEXT_AWARE(node_udp_wrap, node::UDPWrap::Initialize)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(udp_wrap, node::UDPWrap::Initialize)
} // namespace uv
} // namespace node
-NODE_MODULE_CONTEXT_AWARE(node_uv, node::uv::Initialize)
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(uv, node::uv::Initialize)
projects / platform / upstream / nodejs.git / commitdiff