Skip to content

tsfn: Implement copy constructor #546

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

Merged
mhdawson merged 13 commits into from
Nov 1, 2019
Merged

tsfn: Implement copy constructor #546

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1b42bfc
tsfn: Implement copy constructor
KevinEady Sep 18, 2019
e9f38dc
Merge remote-tracking branch 'upstream/master' into tsfn-copy-ctor
KevinEady Oct 2, 2019
e10e683
change FinalizerCallback to static method
KevinEady Oct 2, 2019
dfa9e5f
tsfn: add copy ctor comments to test
KevinEady Oct 9, 2019
a033340
merge master, resolve conflicts
KevinEady Oct 24, 2019
815c1fe
tsfn: remove unnecessary constructors, operators
KevinEady Oct 24, 2019
3219515
test: change tsfn test data construction
KevinEady Oct 24, 2019
0e9d4ae
test: fix tsfn tests by napi version
KevinEady Oct 24, 2019
cba39bf
test: use explicit std qualifiers in tsfn test
KevinEady Oct 25, 2019
5b83cf2
tsfn: use mutex, cv for tests vs promise
KevinEady Oct 29, 2019
5011023
Merge branch 'master' into tsfn-copy-ctor
KevinEady Oct 29, 2019
4b3d134
test: remove unnecessary include
KevinEady Oct 30, 2019
bcdc46c
test: add std includes
KevinEady Oct 30, 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
merge master, resolve conflicts
  • Loading branch information
@KevinEady
KevinEady committed Oct 24, 2019
commit a0333400890e07ec029663fe38dafc18b05b6685
4 changes: 2 additions & 2 deletions napi-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4084,14 +4084,14 @@ inline napi_status ThreadSafeFunction::NonBlockingCall(

inline void ThreadSafeFunction::Ref(napi_env env) const {
if (_tsfn != nullptr) {
napi_status status = napi_ref_threadsafe_function(env, *_tsfn);
napi_status status = napi_ref_threadsafe_function(env, _tsfn);
NAPI_THROW_IF_FAILED_VOID(env, status);
}
}

inline void ThreadSafeFunction::Unref(napi_env env) const {
if (_tsfn != nullptr) {
napi_status status = napi_unref_threadsafe_function(env, *_tsfn);
napi_status status = napi_unref_threadsafe_function(env, _tsfn);
NAPI_THROW_IF_FAILED_VOID(env, status);
}
}
Expand Down
2 changes: 2 additions & 0 deletions test/binding.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Object InitPromise(Env env);
#if (NAPI_VERSION > 3)
Object InitThreadSafeFunctionPtr(Env env);
Object InitThreadSafeFunctionSum(Env env);
Object InitThreadSafeFunctionUnref(Env env);
Object InitThreadSafeFunction(Env env);
#endif
Object InitTypedArray(Env env);
Expand Down Expand Up @@ -85,6 +86,7 @@ Object Init(Env env, Object exports) {
#if (NAPI_VERSION > 3)
exports.Set("threadsafe_function_ptr", InitThreadSafeFunctionPtr(env));
exports.Set("threadsafe_function_sum", InitThreadSafeFunctionSum(env));
exports.Set("threadsafe_function_unref", InitThreadSafeFunctionUnref(env));
exports.Set("threadsafe_function", InitThreadSafeFunction(env));
#endif
exports.Set("typedarray", InitTypedArray(env));
Expand Down
1 change: 1 addition & 0 deletions test/binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
'promise.cc',
'threadsafe_function/threadsafe_function_ptr.cc',
'threadsafe_function/threadsafe_function_sum.cc',
'threadsafe_function/threadsafe_function_unref.cc',
'threadsafe_function/threadsafe_function.cc',
'typedarray.cc',
'objectwrap.cc',
Expand Down
1 change: 1 addition & 0 deletions test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ let testModules = [
'promise',
'threadsafe_function/threadsafe_function_ptr',
'threadsafe_function/threadsafe_function_sum',
'threadsafe_function/threadsafe_function_unref',
'threadsafe_function/threadsafe_function',
'typedarray',
'typedarray-bigint',
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.