Skip to content

tsfn: Remove erroneous finalizer cleanup #636

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
KevinEady wants to merge 2 commits into from
Closed

tsfn: Remove erroneous finalizer cleanup #636

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f92c65
tsfn: Remove erroneous finalizer cleanup
KevinEady Dec 16, 2019
60fc8e0
Remove unnecessary tsfn member
KevinEady Dec 16, 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
15 changes: 1 addition & 14 deletions napi-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,6 @@ struct ThreadSafeFinalize {
ThreadSafeFinalize* finalizeData =
static_cast<ThreadSafeFinalize*>(rawFinalizeData);
finalizeData->callback(Env(env));
if (finalizeData->tsfn) {
*finalizeData->tsfn = nullptr;
}
delete finalizeData;
}

Expand All @@ -166,9 +163,6 @@ struct ThreadSafeFinalize {
ThreadSafeFinalize* finalizeData =
static_cast<ThreadSafeFinalize*>(rawFinalizeData);
finalizeData->callback(Env(env), finalizeData->data);
if (finalizeData->tsfn) {
*finalizeData->tsfn = nullptr;
}
delete finalizeData;
}

Expand All @@ -182,9 +176,6 @@ struct ThreadSafeFinalize {
ThreadSafeFinalize* finalizeData =
static_cast<ThreadSafeFinalize*>(rawFinalizeData);
finalizeData->callback(Env(env), static_cast<ContextType*>(rawContext));
if (finalizeData->tsfn) {
*finalizeData->tsfn = nullptr;
}
delete finalizeData;
}

Expand All @@ -199,15 +190,11 @@ struct ThreadSafeFinalize {
static_cast<ThreadSafeFinalize*>(rawFinalizeData);
finalizeData->callback(Env(env), finalizeData->data,
static_cast<ContextType*>(rawContext));
if (finalizeData->tsfn) {
*finalizeData->tsfn = nullptr;
}
delete finalizeData;
}

FinalizerDataType* data;
Finalizer callback;
napi_threadsafe_function* tsfn;
};
#endif

Expand Down Expand Up @@ -4530,7 +4517,7 @@ inline ThreadSafeFunction ThreadSafeFunction::New(napi_env env,

ThreadSafeFunction tsfn;
auto* finalizeData = new details::ThreadSafeFinalize<ContextType, Finalizer,
FinalizerDataType>({ data, finalizeCallback, &tsfn._tsfn });
FinalizerDataType>({ data, finalizeCallback });
napi_status status = napi_create_threadsafe_function(env, callback, resource,
Value::From(env, resourceName), maxQueueSize, initialThreadCount,
finalizeData, wrapper, context, CallJS, &tsfn._tsfn);
Expand Down