Skip to content

worker: improve integration with native addons (take II) #26175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
addaleax wants to merge 11 commits into from
Closed

worker: improve integration with native addons (take II) #26175

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
49781f3
worker: improve integration with native addons
addaleax Feb 17, 2019
28017ab
fixup! worker: improve integration with native addons
addaleax Feb 17, 2019
b89e762
fixup! worker: improve integration with native addons
addaleax Feb 18, 2019
170629f
fixup! worker: improve integration with native addons
addaleax Feb 19, 2019
2fb648c
fixup! worker: improve integration with native addons
addaleax Feb 19, 2019
404301d
fixup! worker: improve integration with native addons
addaleax Feb 20, 2019
2f97646
fixup! worker: improve integration with native addons
addaleax Feb 20, 2019
859610f
fixup! worker: improve integration with native addons
addaleax Feb 20, 2019
d1b8fd9
fixup! worker: improve integration with native addons
addaleax Feb 20, 2019
73ddc80
fixup! worker: improve integration with native addons
addaleax Feb 20, 2019
9c0f9d3
fixup! worker: improve integration with native addons
addaleax Feb 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup! worker: improve integration with native addons
  • Loading branch information
@addaleax
addaleax committed Feb 20, 2019
commit 9c0f9d3dbd31ad1316e1849e69e0f9de6336f980
28 changes: 23 additions & 5 deletions src/node_binding.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "env-inl.h"
#include "node_native_module.h"
#include "util.h"
#include <atomic>

#if HAVE_OPENSSL
#define NODE_BUILTIN_OPENSSL_MODULES(V) V(crypto) V(tls_wrap)
Expand Down Expand Up @@ -207,6 +208,19 @@ void* wrapped_dlsym(void* handle, const char* symbol) {

#endif // _AIX

#ifdef __linux__
static bool libc_may_be_musl() {
static std::atomic_bool retval; // Cache the return value.
static std::atomic_bool has_cached_retval { false };
if (has_cached_retval) return retval;
retval = dlsym(RTLD_DEFAULT, "gnu_get_libc_version") == nullptr;
has_cached_retval = true;
return retval;
}
#else // __linux__
static bool libc_may_be_musl() { return false; }
#endif // __linux__

namespace node {

using v8::Context;
Expand Down Expand Up @@ -310,14 +324,18 @@ bool DLib::Open() {

void DLib::Close() {
if (handle_ == nullptr) return;
int err = dlclose(handle_);

if (err == 0) {
// musl libc implements dlclose() as a no-op which returns 1.
if (libc_may_be_musl()) {
// musl libc implements dlclose() as a no-op which returns 0.
// As a consequence, trying to re-load a previously closed addon at a later
// point will not call its static constructors, which Node.js uses.
// Therefore, when dlclose() fails, we assume that the shared object
// still exists and keep it in our handle map.
// Therefore, when we may be using musl libc, we assume that the shared
// object exists indefinitely and keep it in our handle map.
return;
}

int err = dlclose(handle_);
if (err == 0) {
if (has_entry_in_global_handle_map_)
global_handle_map.erase(handle_);
}
Expand Down