Skip to content

src: remove redundant handle_ field in ffi #63665

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

Open
addaleax wants to merge 1 commit into
base: main
Choose a base branch
from
Open

src: remove redundant handle_ field in ffi #63665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 16 additions & 13 deletions src/node_ffi.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,18 @@ void FFIFunctionInfo::MemoryInfo(MemoryTracker* tracker) const {
}

DynamicLibrary::DynamicLibrary(Environment* env, Local<Object> object)
: BaseObject(env, object), lib_{}, handle_(nullptr), symbols_() {
: BaseObject(env, object) {
MakeWeak();
}

DynamicLibrary::~DynamicLibrary() {
this->Close();
}

bool DynamicLibrary::is_closed() const {
return static_cast<void*>(lib_.handle) == nullptr;
}

void DynamicLibrary::MemoryInfo(MemoryTracker* tracker) const {
tracker->TrackFieldWithSize("path", path_.capacity() + 1, "std::string");

Expand Down Expand Up @@ -85,9 +89,9 @@ void DynamicLibrary::Close() {
// dangerous: it can crash the process, produce incorrect output, or corrupt
// memory.

if (handle_ != nullptr) {
if (!is_closed()) {
uv_dlclose(&lib_);
handle_ = nullptr;
lib_ = {};
}

symbols_.clear();
Expand All @@ -97,7 +101,7 @@ void DynamicLibrary::Close() {

Maybe<void*> DynamicLibrary::ResolveSymbol(Environment* env,
const std::string& name) {
if (handle_ == nullptr) {
if (is_closed()) {
THROW_ERR_FFI_LIBRARY_CLOSED(env);
return {};
}
Expand Down Expand Up @@ -378,13 +382,12 @@ void DynamicLibrary::New(const FunctionCallbackInfo<Value>& args) {
library_path = lib->path_.c_str();
}

CHECK(lib->is_closed());
// Open the library
if (uv_dlopen(library_path, &lib->lib_) != 0) {
THROW_ERR_FFI_CALL_FAILED(env, "dlopen failed: %s", uv_dlerror(&lib->lib_));
return;
}

lib->handle_ = static_cast<void*>(lib->lib_.handle);
}

void DynamicLibrary::Close(const FunctionCallbackInfo<Value>& args) {
Expand Down Expand Up @@ -539,7 +542,7 @@ void DynamicLibrary::InvokeCallback(ffi_cif* cif,
// It is unsupported and dangerous for a callback to unregister itself or
// close its owning library while executing. The current invocation must
// return before teardown APIs are used.
if (cb->owner->handle_ == nullptr || cb->ptr == nullptr) {
if (cb->owner->is_closed() || cb->ptr == nullptr) {
if (ret != nullptr && cb->return_type->size > 0) {
std::memset(ret, 0, GetFFIReturnValueStorageSize(cb->return_type));
}
Expand Down Expand Up @@ -669,7 +672,7 @@ void DynamicLibrary::GetFunctions(const FunctionCallbackInfo<Value>& args) {
Local<Context> context = env->context();
DynamicLibrary* lib = Unwrap<DynamicLibrary>(args.This());

if (lib->handle_ == nullptr) {
if (lib->is_closed()) {
THROW_ERR_FFI_LIBRARY_CLOSED(env);
return;
}
Expand Down Expand Up @@ -818,7 +821,7 @@ void DynamicLibrary::GetSymbols(const FunctionCallbackInfo<Value>& args) {
Local<Context> context = env->context();
DynamicLibrary* lib = Unwrap<DynamicLibrary>(args.This());

if (lib->handle_ == nullptr) {
if (lib->is_closed()) {
THROW_ERR_FFI_LIBRARY_CLOSED(env);
return;
}
Expand Down Expand Up @@ -890,7 +893,7 @@ void DynamicLibrary::RegisterCallback(const FunctionCallbackInfo<Value>& args) {
}

DynamicLibrary* lib = Unwrap<DynamicLibrary>(args.This());
if (lib->handle_ == nullptr) {
if (lib->is_closed()) {
THROW_ERR_FFI_LIBRARY_CLOSED(env);
return;
}
Expand Down Expand Up @@ -971,7 +974,7 @@ void DynamicLibrary::UnregisterCallback(
Environment* env = Environment::GetCurrent(args);
DynamicLibrary* lib = Unwrap<DynamicLibrary>(args.This());

if (lib->handle_ == nullptr) {
if (lib->is_closed()) {
THROW_ERR_FFI_LIBRARY_CLOSED(env);
return;
}
Expand Down Expand Up @@ -1007,7 +1010,7 @@ void DynamicLibrary::RefCallback(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
DynamicLibrary* lib = Unwrap<DynamicLibrary>(args.This());

if (lib->handle_ == nullptr) {
if (lib->is_closed()) {
THROW_ERR_FFI_LIBRARY_CLOSED(env);
return;
}
Expand Down Expand Up @@ -1038,7 +1041,7 @@ void DynamicLibrary::UnrefCallback(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
DynamicLibrary* lib = Unwrap<DynamicLibrary>(args.This());

if (lib->handle_ == nullptr) {
if (lib->is_closed()) {
THROW_ERR_FFI_LIBRARY_CLOSED(env);
return;
}
Expand Down
4 changes: 2 additions & 2 deletions src/node_ffi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ class DynamicLibrary : public BaseObject {
const std::shared_ptr<FFIFunction>& fn);
static void CleanupFunctionInfo(
const v8::WeakCallbackInfo<FFIFunctionInfo>& data);
bool is_closed() const;

uv_lib_t lib_;
void* handle_;
uv_lib_t lib_ = {};
std::string path_;
std::unordered_map<std::string, void*> symbols_;
std::unordered_map<std::string, std::shared_ptr<FFIFunction>> functions_;
Expand Down
Loading