Skip to content

tsfn: support direct calls to underlying napi_tsfn #580

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 5 commits into from
Nov 10, 2019
Merged

tsfn: support direct calls to underlying napi_tsfn #580

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8996b52
tsfn: support direct calls to underlying napi_tsfn
KevinEady Oct 29, 2019
d470db1
merge master
KevinEady Nov 1, 2019
74544ac
doc: update tsfn doc
KevinEady Nov 5, 2019
45faeaa
test: minor tsfn test cleanup
KevinEady Nov 7, 2019
0c91bfa
test: refactor existing tsfn test
KevinEady Nov 7, 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
test: refactor existing tsfn test
  • Loading branch information
@KevinEady
KevinEady committed Nov 7, 2019
commit 0c91bfa9113f74fe8d90686cef878a18a0b7d416
41 changes: 23 additions & 18 deletions test/threadsafe_function/threadsafe_function_existing_tsfn.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,42 +8,49 @@ using namespace Napi;
namespace {

struct TestContext {
TestContext(Promise::Deferred &&deferred) : deferred(std::move(deferred)){};
TestContext(Promise::Deferred &&deferred)
: deferred(std::move(deferred)), callData(nullptr){};

napi_threadsafe_function tsfn;
Promise::Deferred deferred;
double *callData;

~TestContext() {
if (callData != nullptr)
delete callData;
};
};

void FinalizeCB(napi_env /*env*/, void *context, void * /*finalizedata*/) {
void FinalizeCB(napi_env env, void * /*finalizeData */, void *context) {
TestContext *testContext = static_cast<TestContext *>(context);
if (testContext->callData != nullptr) {
testContext->deferred.Resolve(Number::New(env, *testContext->callData));
} else {
testContext->deferred.Resolve(Napi::Env(env).Undefined());
}
delete testContext;
}

void CallJSWithData(napi_env env, napi_value value, void *context, void *data) {
void CallJSWithData(napi_env env, napi_value /* callback */, void *context,
void *data) {
TestContext *testContext = static_cast<TestContext *>(context);
double *dblVal = static_cast<double *>(data);
Function(env, value).Call({Number::New(env, *dblVal)});
delete dblVal;
testContext->callData = static_cast<double *>(data);

napi_status status =
napi_release_threadsafe_function(testContext->tsfn, napi_tsfn_release);

NAPI_THROW_IF_FAILED_VOID(env, status);

testContext->deferred.Resolve(Env(env).Undefined());
}

void CallJSNoData(napi_env env, napi_value value, void *context,
void CallJSNoData(napi_env env, napi_value /* callback */, void *context,
void * /*data*/) {
TestContext *testContext = static_cast<TestContext *>(context);
Value undef = Env(env).Undefined();
Function(env, value).Call({undef});
testContext->callData = nullptr;

napi_status status =
napi_release_threadsafe_function(testContext->tsfn, napi_tsfn_release);

NAPI_THROW_IF_FAILED_VOID(env, status);

testContext->deferred.Resolve(undef);
}

static Value TestCall(const CallbackInfo &info) {
Expand All @@ -61,9 +68,7 @@ static Value TestCall(const CallbackInfo &info) {
}

// Allow optional callback passed from JS. Useful for testing.
Function cb = info.Length() > 1
? info[1].As<Function>()
: Function::New(env, [](const CallbackInfo &/*info*/) {});
Function cb = Function::New(env, [](const CallbackInfo & /*info*/) {});

TestContext *testContext = new TestContext(Napi::Promise::Deferred(env));

Expand All @@ -82,13 +87,13 @@ static Value TestCall(const CallbackInfo &info) {
if (hasData) {
wrapped.BlockingCall(static_cast<void *>(new double(std::rand())));
} else {
wrapped.BlockingCall(nullptr);
wrapped.BlockingCall(static_cast<void *>(nullptr));
}
} else {
if (hasData) {
wrapped.NonBlockingCall(static_cast<void *>(new double(std::rand())));
} else {
wrapped.NonBlockingCall(nullptr);
wrapped.NonBlockingCall(static_cast<void *>(nullptr));
}
}

Expand Down
17 changes: 4 additions & 13 deletions test/threadsafe_function/threadsafe_function_existing_tsfn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,9 @@ module.exports = Promise.all([

async function test(binding) {
const testCall = binding.threadsafe_function_existing_tsfn.testCall;
let lastResult;

const funct = arg0 => {
lastResult = arg0;
}

await testCall({ blocking: true, data: true }, funct);
assert(typeof lastResult === "number");
await testCall({ blocking: true, data: false }, funct);
assert(typeof lastResult === "undefined");
await testCall({ blocking: false, data: true }, funct);
assert(typeof lastResult === "number");
await testCall({ blocking: false, data: false }, funct);
assert(typeof lastResult === "undefined");
assert(typeof await testCall({ blocking: true, data: true }) === "number");
assert(typeof await testCall({ blocking: true, data: false }) === "undefined");
assert(typeof await testCall({ blocking: false, data: true }) === "number");
assert(typeof await testCall({ blocking: false, data: false }) === "undefined");
}