Skip to content

test: run in both a child process and a worker thread #738

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
gabrielschulhof wants to merge 3 commits into from
Closed

test: run in both a child process and a worker thread #738

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46e835f
test: run in both a child process and a worker thread
May 27, 2020
7370b7f
test: fix tsfn sum test
May 27, 2020
16cc763
add --experimental-worker
Jun 2, 2020
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
test: fix tsfn sum test 
The TSFN sum test was not waiting for all TSFN calls to complete before
releasing the TSFN completely. The main thread must only release the
TSFN and resolve the deferred if all calls have completed.
  • Loading branch information
Gabriel Schulhof committed Jul 22, 2020
commit 7370b7f0dbadee376685a72f17902467fa7d56ef
27 changes: 21 additions & 6 deletions test/threadsafe_function/threadsafe_function_sum.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,21 @@ namespace {
struct TestData {

TestData(Promise::Deferred&& deferred) : deferred(std::move(deferred)) {};

// These variables are accessed only from the main thread. They keep track of
// the number of expected incoming calls that have completed. We do not want
// to release the thread-safe function until all expected calls are complete.
size_t threadsCreated = 0;
size_t callsCompleted = 0;
Comment thread
legendecas marked this conversation as resolved.
// A value of true for this variable indicates that no more new threads will
// be created.
bool threadsStopped = false;

// Native Promise returned to JavaScript
Promise::Deferred deferred;

// List of threads created for test. This list only ever accessed via main
// thread.
// List of threads created for test. This list is only ever accessed via the
// main thread.
std::vector<std::thread> threads = {};

ThreadSafeFunction tsfn = ThreadSafeFunction();
Expand Down Expand Up @@ -142,11 +151,16 @@ static Value TestDelayedTSFN(const CallbackInfo &info) {
return testData->deferred.Promise();
}

void entryAcquire(ThreadSafeFunction tsfn, int threadId) {
void entryAcquire(ThreadSafeFunction tsfn, int threadId, TestData* testData) {
tsfn.Acquire();
std::this_thread::sleep_for(std::chrono::milliseconds(std::rand() % 100 + 1));
tsfn.BlockingCall( [=](Napi::Env env, Function callback) {
callback.Call( { Number::New(env, static_cast<double>(threadId))});
testData->callsCompleted++;
if (testData->threadsStopped &&
testData->callsCompleted == testData->threadsCreated) {
testData->tsfn.Release();
}
});
tsfn.Release();
}
Expand All @@ -156,14 +170,15 @@ static Value CreateThread(const CallbackInfo& info) {
ThreadSafeFunction tsfn = testData->tsfn;
int threadId = testData->threads.size();
// A copy of the ThreadSafeFunction will go to the thread entry point
testData->threads.push_back( std::thread(entryAcquire, tsfn, threadId) );
testData->threads
.push_back(std::thread(entryAcquire, tsfn, threadId, testData));
testData->threadsCreated++;
return Number::New(info.Env(), threadId);
}

static Value StopThreads(const CallbackInfo& info) {
TestData* testData = static_cast<TestData*>(info.Data());
ThreadSafeFunction tsfn = testData->tsfn;
tsfn.Release();
testData->threadsStopped = true;
return info.Env().Undefined();
}

Expand Down