Skip to content

tsfn: support direct calls to underlying napi_tsfn - #580

Merged
mhdawson merged 5 commits into
nodejs:masterfrom
KevinEady:existing-tsfn
Nov 10, 2019
Merged

tsfn: support direct calls to underlying napi_tsfn#580
mhdawson merged 5 commits into
nodejs:masterfrom
KevinEady:existing-tsfn

Conversation

@KevinEady

@KevinEadyKevinEady commented Oct 29, 2019

Copy link
Copy Markdown
Contributor

Fixes: #556

@KevinEady

KevinEady commented Oct 29, 2019

Copy link
Copy Markdown
ContributorAuthor

The implementation for this is based off previous napi meeting discussion, see #556 (comment)

@NickNasoNickNaso mentioned this pull request Oct 29, 2019
Closed
15 tasks
KevinEady
KevinEady commented Oct 30, 2019
View reviewed changes

@KevinEadyKevinEady left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like mentioned, this PR directly conflicts with #546 on the use of unique_ptr<napi_threadsafe_function> vs napi_threadsafe_function. It's a simple change to resolve, by changing *_tsfn to _tsfn ...

Comment threadnapi-inl.h Outdated
Comment threadnapi-inl.h Outdated
mhdawson
mhdawson approved these changes Oct 31, 2019
View reviewed changes

@mhdawsonmhdawson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mhdawson

mhdawson commented Oct 31, 2019

Copy link
Copy Markdown
Member

Looks reasonable to me @gabrielschulhof can you take a look at as well?

gabrielschulhof
gabrielschulhof approved these changes Nov 5, 2019
View reviewed changes
Comment threaddoc/threadsafe_function.md Outdated

napi_status Napi::ThreadSafeFunction::NonBlockingCall(void* data) const
```
- `data`: Data to pass to `call_js_cb` specified when creating the tsfn via

@gabrielschulhofgabrielschulhofNov 4, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
-`data`: Data to pass to `call_js_cb` specified when creating the tsfn via
-`data`: Data to pass to `call_js_cb` specified when creating the thread-safe function via

@KevinEadyKevinEadyNov 5, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After a nasty fight between 500s from GitHub's commit suggestion API and various force pushes, this is comment has been updated 👍

@KevinEady

KevinEady commented Nov 5, 2019

Copy link
Copy Markdown
ContributorAuthor

Hi @mhdawson / @gabrielschulhof dunno what to do for this build failure:

https://travis-ci.com/nodejs/node-addon-api/jobs/253158482

Reading package lists...
Building dependency tree...
Reading state information...
E: Unable to locate package g++-4.9
E: Couldn't find any package by glob 'g++-4.9'
E: Couldn't find any package by regex 'g++-4.9'
apt-get.diagnostics
apt-get install failed
The command "sudo -E apt-get -yq --no-install-suggests --no-install-recommends $(travis_apt_get_options) install g++-4.9" failed and exited with 100 during .

@gabrielschulhof

gabrielschulhof commented Nov 5, 2019

Copy link
Copy Markdown
Contributor

@KevinEady I restarted the job.

@KevinEady

KevinEady commented Nov 7, 2019

Copy link
Copy Markdown
ContributorAuthor

Hi @mhdawson just a reminder on landing this

@KevinEadyKevinEady mentioned this pull request Nov 7, 2019
Merged
legendecas
legendecas reviewed Nov 7, 2019
View reviewed changes
Comment threadtest/threadsafe_function/threadsafe_function_existing_tsfn.js Outdated
Comment threadtest/threadsafe_function/threadsafe_function_existing_tsfn.js Outdated
Comment threadtest/threadsafe_function/threadsafe_function_existing_tsfn.cc Outdated
legendecas
legendecas approved these changes Nov 7, 2019
View reviewed changes

@legendecaslegendecas left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just found some nits in test :P.

@KevinEadyKevinEady mentioned this pull request Nov 7, 2019
Closed
@mhdawson
mhdawson merged commit df75e08 into nodejs:masterNov 10, 2019
@mhdawson

mhdawson commented Nov 10, 2019

Copy link
Copy Markdown
Member

Landed as df75e08c2bae11b84ebbf5a1c6d54df8621b16fd

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gabrielschulhofgabrielschulhofgabrielschulhof approved these changes
@legendecaslegendecaslegendecas approved these changes
@mhdawsonmhdawsonmhdawson approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

ThreadSafeFunction(napi_threadsafe_function) works badly with BlockingCall()

4 participants

@KevinEady@mhdawson@gabrielschulhof@legendecas