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

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
change FinalizerCallback to static method
  • Loading branch information
@KevinEady
KevinEady committed Oct 2, 2019
commit e10e683a078a53be6984d2602e6d3be5da0d5d69
45 changes: 24 additions & 21 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 @@ -20,40 +20,39 @@ struct TestData {
ThreadSafeFunction tsfn = ThreadSafeFunction();
};

// The no-context with finalizer + finalizer data overload is
// ambiguous. Workaround: use a lambda...

#define FinalizerCallback [](Napi::Env env, TestData* finalizeData){ \
for (size_t i = 0; i < finalizeData->threads.size(); ++i) { \
finalizeData->threads[i].join(); \
} \
finalizeData->deferred.Resolve(Boolean::New(env,true)); \
delete finalizeData; \
void FinalizerCallback(Napi::Env env, TestData* finalizeData){
for (size_t i = 0; i < finalizeData->threads.size(); ++i) {
finalizeData->threads[i].join();
}
finalizeData->deferred.Resolve(Boolean::New(env,true));
delete finalizeData;
}

/**
/**
* See threadsafe_function_sum.js for descriptions of the tests in this file
*/

void entryWithTSFN(ThreadSafeFunction tsfn, int threadId) {
std::this_thread::sleep_for(std::chrono::milliseconds(std::rand() % 100 + 1));
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))});
});
tsfn.Release();
}

static Value TestWithTSFN(const CallbackInfo& info) {
static Value TestWithTSFN(const CallbackInfo& info) {
int threadCount = info[0].As<Number>().Int32Value();
Function cb = info[1].As<Function>();

// We pass the test data to the Finalizer for cleanup. The finalizer is
// We pass the test data to the Finalizer for cleanup. The finalizer is
// responsible for deleting this data as well.
TestData *testData = new TestData({
Promise::Deferred::New(info.Env())
});

ThreadSafeFunction tsfn = ThreadSafeFunction::New(info.Env(), cb, "Test", 0, threadCount, FinalizerCallback, testData);
ThreadSafeFunction tsfn = ThreadSafeFunction::New(
info.Env(), cb, "Test", 0, threadCount,
std::function<decltype(FinalizerCallback)>(FinalizerCallback), testData);

for (int i = 0; i < threadCount; ++i) {
testData->threads.push_back( thread(entryWithTSFN, tsfn, i) );
Expand All @@ -64,15 +63,15 @@ static Value TestWithTSFN(const CallbackInfo& info) {


void entryDelayedTSFN(std::future<ThreadSafeFunction> tsfnFuture, int threadId) {
std::this_thread::sleep_for(std::chrono::milliseconds(std::rand() % 100 + 1));
std::this_thread::sleep_for(std::chrono::milliseconds(std::rand() % 100 + 1));
ThreadSafeFunction tsfn = tsfnFuture.get();
tsfn.BlockingCall( [=](Napi::Env env, Function callback) {
callback.Call( { Number::New(env, static_cast<double>(threadId))});
});
tsfn.Release();
}

static Value TestDelayedTSFN(const CallbackInfo& info) {
static Value TestDelayedTSFN(const CallbackInfo& info) {
int threadCount = info[0].As<Number>().Int32Value();
Function cb = info[1].As<Function>();

Expand All @@ -87,7 +86,9 @@ static Value TestDelayedTSFN(const CallbackInfo& info) {
testData->threads.push_back( thread(entryDelayedTSFN, tsfnPromises[i].get_future(), i) );
}

testData->tsfn = ThreadSafeFunction::New(info.Env(), cb, "Test", 0, threadCount, FinalizerCallback, testData);
testData->tsfn = ThreadSafeFunction::New(
info.Env(), cb, "Test", 0, threadCount,
std::function<decltype(FinalizerCallback)>(FinalizerCallback), testData);

for (int i = 0; i < threadCount; ++i) {
tsfnPromises[i].set_value(testData->tsfn);
Expand All @@ -98,7 +99,7 @@ static Value TestDelayedTSFN(const CallbackInfo& info) {

void entryAcquire(ThreadSafeFunction tsfn, int threadId) {
tsfn.Acquire();
std::this_thread::sleep_for(std::chrono::milliseconds(std::rand() % 100 + 1));
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))});
});
Expand All @@ -120,17 +121,19 @@ static Value StopThreads(const CallbackInfo& info) {
return info.Env().Undefined();
}

static Value TestAcquire(const CallbackInfo& info) {
static Value TestAcquire(const CallbackInfo& info) {
Function cb = info[0].As<Function>();
Napi::Env env = info.Env();

// We pass the test data to the Finalizer for cleanup. The finalizer is
// We pass the test data to the Finalizer for cleanup. The finalizer is
// responsible for deleting this data as well.
TestData *testData = new TestData({
Promise::Deferred::New(env)
});

testData->tsfn = ThreadSafeFunction::New(env, cb, "Test", 0, 1, FinalizerCallback, testData);
testData->tsfn = ThreadSafeFunction::New(
env, cb, "Test", 0, 1,
std::function<decltype(FinalizerCallback)>(FinalizerCallback), testData);

Object result = Object::New(env);
result["createThread"] = Function::New( env, CreateThread, "createThread", testData);
Expand Down