Skip to content

Commit 5eeabb0

Browse files
KevinEadyGabriel Schulhof
authored andcommitted
tsfn: Remove erroneous finalizer cleanup
Removes leftover cleanup in finalizer that was part of the original TSFN implementation. Fixes: #632 PR-URL: #636 Reviewed-By: Gabriel Schulhof <gabriel.schulhof@intel.com>
1 parent 9e0e0f3 commit 5eeabb0

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

napi-inl.h

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,6 @@ struct ThreadSafeFinalize {
150150
ThreadSafeFinalize* finalizeData =
151151
static_cast<ThreadSafeFinalize*>(rawFinalizeData);
152152
finalizeData->callback(Env(env));
153-
if (finalizeData->tsfn) {
154-
*finalizeData->tsfn = nullptr;
155-
}
156153
delete finalizeData;
157154
}
158155

@@ -166,9 +163,6 @@ struct ThreadSafeFinalize {
166163
ThreadSafeFinalize* finalizeData =
167164
static_cast<ThreadSafeFinalize*>(rawFinalizeData);
168165
finalizeData->callback(Env(env), finalizeData->data);
169-
if (finalizeData->tsfn) {
170-
*finalizeData->tsfn = nullptr;
171-
}
172166
delete finalizeData;
173167
}
174168

@@ -182,9 +176,6 @@ struct ThreadSafeFinalize {
182176
ThreadSafeFinalize* finalizeData =
183177
static_cast<ThreadSafeFinalize*>(rawFinalizeData);
184178
finalizeData->callback(Env(env), static_cast<ContextType*>(rawContext));
185-
if (finalizeData->tsfn) {
186-
*finalizeData->tsfn = nullptr;
187-
}
188179
delete finalizeData;
189180
}
190181

@@ -199,15 +190,11 @@ struct ThreadSafeFinalize {
199190
static_cast<ThreadSafeFinalize*>(rawFinalizeData);
200191
finalizeData->callback(Env(env), finalizeData->data,
201192
static_cast<ContextType*>(rawContext));
202-
if (finalizeData->tsfn) {
203-
*finalizeData->tsfn = nullptr;
204-
}
205193
delete finalizeData;
206194
}
207195

208196
FinalizerDataType* data;
209197
Finalizer callback;
210-
napi_threadsafe_function* tsfn;
211198
};
212199
#endif
213200

@@ -4528,7 +4515,7 @@ inline ThreadSafeFunction ThreadSafeFunction::New(napi_env env,
45284515

45294516
ThreadSafeFunction tsfn;
45304517
auto* finalizeData = new details::ThreadSafeFinalize<ContextType, Finalizer,
4531-
FinalizerDataType>({ data, finalizeCallback, &tsfn._tsfn });
4518+
FinalizerDataType>({ data, finalizeCallback });
45324519
napi_status status = napi_create_threadsafe_function(env, callback, resource,
45334520
Value::From(env, resourceName), maxQueueSize, initialThreadCount,
45344521
finalizeData, wrapper, context, CallJS, &tsfn._tsfn);

0 commit comments

Comments
 (0)