Skip to content

Check the BHM option before starting it in multi-process mode.#26106

Merged
bors-servo merged 1 commit intoservo:masterfrom
qrasmont:fix-26088-bhm-opt-in-multiproc
Apr 4, 2020
Merged

Check the BHM option before starting it in multi-process mode.#26106
bors-servo merged 1 commit intoservo:masterfrom
qrasmont:fix-26088-bhm-opt-in-multiproc

Conversation

@qrasmont
Copy link
Copy Markdown
Contributor

@qrasmont qrasmont commented Apr 3, 2020

In multi-process mode, if the BHM option is set start with one otherwise don't.

I didn't add a test for this. However if I should I'd be happy to be pointed to where similar tests are done (meaning tests of options yielding the expected state) because I didn't find my way in all those tests.


@highfive
Copy link
Copy Markdown

highfive commented Apr 3, 2020

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @asajeffrey (or someone else) soon.

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Apr 3, 2020
background_hang_monitor_register,
None,
);
if opts::get().background_hang_monitor {
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.

It might be clearer to do something like:

let background_hang_monitor_register = if opts::get().background_hang_monitor {
     unprivileged_content.register_with_background_hang_monitor()
} else {
     None
};

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Indeed!

Copy link
Copy Markdown
Member

@gterzian gterzian left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution, looks like the solution is right, with a small stylistic suggestion...

@qrasmont qrasmont force-pushed the fix-26088-bhm-opt-in-multiproc branch from cf73462 to 8b9390d Compare April 4, 2020 09:03
Copy link
Copy Markdown
Member

@gterzian gterzian left a comment

Choose a reason for hiding this comment

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

Looks good, and thanks for the contribution!

@gterzian
Copy link
Copy Markdown
Member

gterzian commented Apr 4, 2020

@bors-servo r+

@bors-servo
Copy link
Copy Markdown
Contributor

📌 Commit 8b9390d has been approved by gterzian

@highfive highfive assigned gterzian and unassigned asajeffrey Apr 4, 2020
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Apr 4, 2020
@bors-servo
Copy link
Copy Markdown
Contributor

⌛ Testing commit 8b9390d with merge 9972aee...

@bors-servo
Copy link
Copy Markdown
Contributor

☀️ Test successful - status-taskcluster
Approved by: gterzian
Pushing 9972aee to master...

@bors-servo bors-servo merged commit 9972aee into servo:master Apr 4, 2020
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Apr 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Check for Background-Hang-Monitor opts in multi-process

5 participants