Skip to content
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

Jump to bottom

worker: fix type check in receiveMessageOnPort #32745

Closed
wants to merge 1 commit into from
Closed

worker: fix type check in receiveMessageOnPort #32745

wants to merge 1 commit into from

Conversation

addaleax
Copy link
Member

@addaleax addaleax commented Apr 9, 2020

Use the same type check we use in MoveToContext() in
ReceiveMessage().

Fixes: #32742

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines

@addaleax
worker: fix type check in receiveMessageOnPort
355f4bd 
Use the same type check we use in `MoveToContext()` in
`ReceiveMessage()`.

Fixes: nodejs#32742
@addaleax addaleax added worker Issues and PRs related to Worker support. lts-watch-v10.x labels Apr 9, 2020
@nodejs-github-bot nodejs-github-bot added the c++ Issues and PRs that require attention from people who are familiar with C++. label Apr 9, 2020
@addaleax addaleax added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Apr 9, 2020
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/30598/

ZYSzys
ZYSzys reviewed Apr 10, 2020
View reviewed changes
src/node_messaging.cc
if (!args[0]->IsObject() ||
!env->message_port_constructor_template()->HasInstance(args[0])) {
return THROW_ERR_INVALID_ARG_TYPE(env,
"First argument needs to be a MessagePort instance");
Copy link
Member

Choose a reason for hiding this comment

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

To be consistent with the doc, maybe change to:

Suggested change
"First argument needs to be a MessagePort instance");
'The "port" argument must be a MessagePort instance');

Copy link
Member Author

Choose a reason for hiding this comment

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

@ZYSzys Do you maybe want to open a PR after this lands that makes this consistent across both instances?

Copy link
Member

Choose a reason for hiding this comment

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

Aha, I missed that there is still somewhere else need to be consistent.

Make sense to do it entirely after this lands.

@HarshithaKP
Copy link
Member

LGTM.

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/30614/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/30668/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/30675/

addaleax added a commit that referenced this pull request Apr 13, 2020
@addaleax
worker: fix type check in receiveMessageOnPort
a46345d 
Use the same type check we use in `MoveToContext()` in
`ReceiveMessage()`.

Fixes: #32742

PR-URL: #32745
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Gerhard Stöbich <[email protected]>
Reviewed-By: Yongsheng Zhang <[email protected]>
Reviewed-By: Zeyu Yang <[email protected]>
@addaleax
Copy link
Member Author

Landed in a46345d

@addaleax addaleax closed this Apr 13, 2020
@addaleax addaleax deleted the messageport-receivemessage branch April 13, 2020 13:08
addaleax added a commit to addaleax/node that referenced this pull request Apr 13, 2020
@addaleax
worker: mention argument name in type check message
ee7caf5 
Refs: nodejs#32745 (comment)
@addaleax addaleax mentioned this pull request Apr 13, 2020
Closed
3 tasks
BethGriggs pushed a commit that referenced this pull request Apr 14, 2020
@addaleax @BethGriggs
worker: fix type check in receiveMessageOnPort
7147df5 
Use the same type check we use in `MoveToContext()` in
`ReceiveMessage()`.

Fixes: #32742

PR-URL: #32745
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Gerhard Stöbich <[email protected]>
Reviewed-By: Yongsheng Zhang <[email protected]>
Reviewed-By: Zeyu Yang <[email protected]>
@BethGriggs BethGriggs mentioned this pull request Apr 14, 2020
Merged
addaleax added a commit that referenced this pull request Apr 15, 2020
@addaleax
worker: mention argument name in type check message
d699fdd 
Refs: #32745 (comment)

PR-URL: #32815
Reviewed-By: Zeyu Yang <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Yongsheng Zhang <[email protected]>
MylesBorins pushed a commit that referenced this pull request Apr 17, 2020
@addaleax @MylesBorins
worker: mention argument name in type check message
7fe6122 
Refs: #32745 (comment)

PR-URL: #32815
Reviewed-By: Zeyu Yang <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Yongsheng Zhang <[email protected]>
@targos targos removed author ready PRs that have at least one approval, no pending requests for changes, and a CI started. lts-watch-v12.x labels Apr 25, 2020
targos pushed a commit to targos/node that referenced this pull request Apr 25, 2020
@addaleax @targos
worker: fix type check in receiveMessageOnPort
414ab96 
Use the same type check we use in `MoveToContext()` in
`ReceiveMessage()`.

Fixes: nodejs#32742

PR-URL: nodejs#32745
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Gerhard Stöbich <[email protected]>
Reviewed-By: Yongsheng Zhang <[email protected]>
Reviewed-By: Zeyu Yang <[email protected]>
BridgeAR pushed a commit that referenced this pull request Apr 28, 2020
@addaleax @BridgeAR
worker: fix type check in receiveMessageOnPort
b80b08f 
Use the same type check we use in `MoveToContext()` in
`ReceiveMessage()`.

Fixes: #32742

PR-URL: #32745
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Gerhard Stöbich <[email protected]>
Reviewed-By: Yongsheng Zhang <[email protected]>
Reviewed-By: Zeyu Yang <[email protected]>
@BridgeAR BridgeAR mentioned this pull request Apr 28, 2020
Merged
targos pushed a commit that referenced this pull request Apr 28, 2020
@addaleax @targos
worker: fix type check in receiveMessageOnPort
57cd7d2 
Use the same type check we use in `MoveToContext()` in
`ReceiveMessage()`.

Fixes: #32742

PR-URL: #32745
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Gerhard Stöbich <[email protected]>
Reviewed-By: Yongsheng Zhang <[email protected]>
Reviewed-By: Zeyu Yang <[email protected]>
@targos targos mentioned this pull request May 2, 2020
Merged
@richardlau
Copy link
Member

This looks dependent on #27294 which has a backport requested for 10.x label.

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

@ZYSzys ZYSzys ZYSzys approved these changes

@Flarna Flarna Flarna approved these changes

@himself65 himself65 himself65 approved these changes

@cjihrig cjihrig cjihrig approved these changes

Assignees
No one assigned
Labels
c++ Issues and PRs that require attention from people who are familiar with C++. worker Issues and PRs related to Worker support.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

'worker_threads.receiveMessageOnPort' results in an abort
9 participants
@addaleax @nodejs-github-bot @HarshithaKP @richardlau @cjihrig @himself65 @Flarna @ZYSzys @targos