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
Next Next commit
fixup! worker: improve integration with native addons
  • Loading branch information
@addaleax
addaleax committed Feb 20, 2019
commit 859610f9ebca1d37280312a15820c61066dd1e75
17 changes: 14 additions & 3 deletions src/node_binding.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ int wrapped_dlclose(void* handle) {
Mutex::ScopedLock lock(dlhandles_mutex);
dl_wrap* wrap = static_cast<dl_wrap*>(handle);
int ret = 0;
CHECK_GE(wrap->refcount, 1);
if (--wrap->refcount == 0) {
ret = dlclose(wrap->real_handle);
if (ret != 0) dlerror_storage = dlerror();
Expand All @@ -190,6 +191,8 @@ int wrapped_dlclose(void* handle) {
}

void* wrapped_dlsym(void* handle, const char* symbol) {
if (handle == RTLD_DEFAULT || handle == RTLD_NEXT)
return dlsym(handle, symbol);
dl_wrap* wrap = static_cast<dl_wrap*>(handle);
return dlsym(wrap->real_handle, symbol);
}
Expand Down Expand Up @@ -299,9 +302,17 @@ bool DLib::Open() {

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

if (err == 0) {
// musl libc implements dlclose() as a no-op which returns 1.
// 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.
if (has_entry_in_global_handle_map_)
global_handle_map.erase(handle_);
}
handle_ = nullptr;
}

Expand Down