Add NODE_RTLD_GLOBAL to control library loading

deps/uv/docs/src/dll.rst

@@ -25,7 +25,7 @@ N/A
 API
 ---
 
-.. c:function:: int uv_dlopen(const char* filename, uv_lib_t* lib)
+.. c:function:: int uv_dlopen(const char* filename, uv_lib_t* lib, int glob)
 
     Opens a shared library. The filename is in utf-8. Returns 0 on success and
     -1 on error. Call :c:func:`uv_dlerror` to get the error message.

deps/uv/include/uv.h

@@ -1367,7 +1367,7 @@ UV_EXTERN extern uint64_t uv_hrtime(void);
 
 UV_EXTERN void uv_disable_stdio_inheritance(void);
 
-UV_EXTERN int uv_dlopen(const char* filename, uv_lib_t* lib);
+UV_EXTERN int uv_dlopen(const char* filename, uv_lib_t* lib, int glob);
 UV_EXTERN void uv_dlclose(uv_lib_t* lib);
 UV_EXTERN int uv_dlsym(uv_lib_t* lib, const char* name, void** ptr);
 UV_EXTERN const char* uv_dlerror(const uv_lib_t* lib);

deps/uv/src/unix/dl.c

@@ -30,10 +30,18 @@
 static int uv__dlerror(uv_lib_t* lib);
 
 
-int uv_dlopen(const char* filename, uv_lib_t* lib) {
+int uv_dlopen(const char* filename, uv_lib_t* lib, int glob) {
+  int flag;
+
   dlerror(); /* Reset error status. */
   lib->errmsg = NULL;
-  lib->handle = dlopen(filename, RTLD_LAZY);
+
+  flag = RTLD_LAZY;
+  if (glob) {
+    flag |= RTLD_GLOBAL;
+  }
+
+  lib->handle = dlopen(filename, flag);
   return lib->handle ? 0 : uv__dlerror(lib);
 }
 

deps/uv/src/win/dl.c

@@ -25,7 +25,7 @@
 static int uv__dlerror(uv_lib_t* lib, int errorno);
 
 
-int uv_dlopen(const char* filename, uv_lib_t* lib) {
+int uv_dlopen(const char* filename, uv_lib_t* lib, int glob) {
   WCHAR filename_w[32768];
 
   lib->handle = NULL;

deps/uv/test/test-dlerror.c

@@ -37,7 +37,7 @@ TEST_IMPL(dlerror) {
   ASSERT(msg != NULL);
   ASSERT(strstr(msg, dlerror_no_error) != NULL);
 
-  r = uv_dlopen(path, &lib);
+  r = uv_dlopen(path, &lib, false);
   ASSERT(r == -1);
 
   msg = uv_dlerror(&lib);

lib/module.js

@@ -420,7 +420,8 @@ Module._extensions['.json'] = function(module, filename) {
 
 //Native extension for .node
 Module._extensions['.node'] = function(module, filename) {
-  return process.dlopen(module, path._makeLong(filename));
+  const dlOpenFlag = process.env.NODE_RTLD_GLOBAL === "true";
+  return process.dlopen(module, path._makeLong(filename), dlOpenFlag);
 };
 
 

src/node.cc

@@ -2153,7 +2153,7 @@ struct node_module* get_linked_module(const char* name) {
 
 typedef void (UV_DYNAMIC* extInit)(Local<Object> exports);
 
-// DLOpen is process.dlopen(module, filename).
+// DLOpen is process.dlopen(module, filename, [glob=false]).
 // Used to load 'module.node' dynamically shared objects.
 //
 // FIXME(bnoordhuis) Not multi-context ready. TBD how to resolve the conflict
@@ -2165,14 +2165,15 @@ void DLOpen(const FunctionCallbackInfo<Value>& args) {
 
   CHECK_EQ(modpending, nullptr);
 
-  if (args.Length() != 2) {
-    env->ThrowError("process.dlopen takes exactly 2 arguments.");
+  if (args.Length() < 2 || args.Length() > 3) {
+    env->ThrowError("process.dlopen takes at least 2 arguments.");
     return;
   }
 
   Local<Object> module = args[0]->ToObject(env->isolate());  // Cast
   node::Utf8Value filename(env->isolate(), args[1]);  // Cast
-  const bool is_dlopen_error = uv_dlopen(*filename, &lib);
+  const bool dl_open_flag = args.Length() == 3 && args[2]->IsBoolean() && args[2]->BooleanValue();
+  const bool is_dlopen_error = uv_dlopen(*filename, &lib, dl_open_flag);
 
   // Objects containing v14 or later modules will have registered themselves
   // on the pending list.  Activate all of them now.  At present, only one