FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

src: remove redundant `handle_` field in ffi · nodejs/node@03858d1 · GitHub

/ node Public

Commit 03858d1

Browse files
addaleax
authored and
aduh95
committed
src: remove redundant handle_ field in ffi
This was just a copy of the immediately preceding `handle_` field in `uv_lib_t`. Signed-off-by: Anna Henningsen <anna@addaleax.net> PR-URL: #63665 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Paolo Insogna <paolo@cowtech.it>
1 parent 57ae876 commit 03858d1

2 files changed

Lines changed: 18 additions & 15 deletions

File tree

‎src/node_ffi.cc‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,18 @@ void FFIFunctionInfo::MemoryInfo(MemoryTracker* tracker) const {
4646
}
4747

4848
DynamicLibrary::DynamicLibrary(Environment* env, Local<Object> object)
49-
: BaseObject(env, object), lib_{}, handle_(nullptr), symbols_() {
49+
: BaseObject(env, object) {
5050
MakeWeak();
5151
}
5252

5353
DynamicLibrary::~DynamicLibrary() {
5454
this->Close();
5555
}
5656

57+
bool DynamicLibrary::is_closed() const {
58+
return static_cast<void*>(lib_.handle) == nullptr;
59+
}
60+
5761
void DynamicLibrary::MemoryInfo(MemoryTracker* tracker) const {
5862
tracker->TrackFieldWithSize("path", path_.capacity() + 1, "std::string");
5963

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

88-
if (handle_ != nullptr) {
92+
if (!is_closed()) {
8993
uv_dlclose(&lib_);
90-
handle_ = nullptr;
94+
lib_ = {};
9195
}
9296

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

98102
Maybe<void*> DynamicLibrary::ResolveSymbol(Environment* env,
99103
const std::string& name) {
100-
if (handle_ == nullptr) {
104+
if (is_closed()) {
101105
THROW_ERR_FFI_LIBRARY_CLOSED(env);
102106
return {};
103107
}
@@ -378,13 +382,12 @@ void DynamicLibrary::New(const FunctionCallbackInfo<Value>& args) {
378382
library_path = lib->path_.c_str();
379383
}
380384

385+
CHECK(lib->is_closed());
381386
// Open the library
382387
if (uv_dlopen(library_path, &lib->lib_) != 0) {
383388
THROW_ERR_FFI_CALL_FAILED(env, "dlopen failed: %s", uv_dlerror(&lib->lib_));
384389
return;
385390
}
386-
387-
lib->handle_ = static_cast<void*>(lib->lib_.handle);
388391
}
389392

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

672-
if (lib->handle_ == nullptr) {
675+
if (lib->is_closed()) {
673676
THROW_ERR_FFI_LIBRARY_CLOSED(env);
674677
return;
675678
}
@@ -818,7 +821,7 @@ void DynamicLibrary::GetSymbols(const FunctionCallbackInfo<Value>& args) {
818821
Local<Context> context = env->context();
819822
DynamicLibrary* lib = Unwrap<DynamicLibrary>(args.This());
820823

821-
if (lib->handle_ == nullptr) {
824+
if (lib->is_closed()) {
822825
THROW_ERR_FFI_LIBRARY_CLOSED(env);
823826
return;
824827
}
@@ -890,7 +893,7 @@ void DynamicLibrary::RegisterCallback(const FunctionCallbackInfo<Value>& args) {
890893
}
891894

892895
DynamicLibrary* lib = Unwrap<DynamicLibrary>(args.This());
893-
if (lib->handle_ == nullptr) {
896+
if (lib->is_closed()) {
894897
THROW_ERR_FFI_LIBRARY_CLOSED(env);
895898
return;
896899
}
@@ -971,7 +974,7 @@ void DynamicLibrary::UnregisterCallback(
971974
Environment* env = Environment::GetCurrent(args);
972975
DynamicLibrary* lib = Unwrap<DynamicLibrary>(args.This());
973976

974-
if (lib->handle_ == nullptr) {
977+
if (lib->is_closed()) {
975978
THROW_ERR_FFI_LIBRARY_CLOSED(env);
976979
return;
977980
}
@@ -1007,7 +1010,7 @@ void DynamicLibrary::RefCallback(const FunctionCallbackInfo<Value>& args) {
10071010
Environment* env = Environment::GetCurrent(args);
10081011
DynamicLibrary* lib = Unwrap<DynamicLibrary>(args.This());
10091012

1010-
if (lib->handle_ == nullptr) {
1013+
if (lib->is_closed()) {
10111014
THROW_ERR_FFI_LIBRARY_CLOSED(env);
10121015
return;
10131016
}
@@ -1038,7 +1041,7 @@ void DynamicLibrary::UnrefCallback(const FunctionCallbackInfo<Value>& args) {
10381041
Environment* env = Environment::GetCurrent(args);
10391042
DynamicLibrary* lib = Unwrap<DynamicLibrary>(args.This());
10401043

1041-
if (lib->handle_ == nullptr) {
1044+
if (lib->is_closed()) {
10421045
THROW_ERR_FFI_LIBRARY_CLOSED(env);
10431046
return;
10441047
}

‎src/node_ffi.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ class DynamicLibrary : public BaseObject {
139139
const std::shared_ptr<FFIFunction>& fn);
140140
static void CleanupFunctionInfo(
141141
const v8::WeakCallbackInfo<FFIFunctionInfo>& data);
142+
bool is_closed() const;
142143

143-
uv_lib_t lib_;
144-
void* handle_;
144+
uv_lib_t lib_ = {};
145145
std::string path_;
146146
std::unordered_map<std::string, void*> symbols_;
147147
std::unordered_map<std::string, std::shared_ptr<FFIFunction>> functions_;

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL