Skip to content

/ servo

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.

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

shutdown synchronously #22239

Merged
merged 1 commit into from Nov 23, 2018
Merged

shutdown synchronously #22239

merged 1 commit into from Nov 23, 2018
+41 −21

Conversation

@paulrouget
Copy link
Contributor

paulrouget commented Nov 21, 2018 •
edited by SimonSapin

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because _____

This change is Reviewable
@highfive
Copy link

highfive commented Nov 21, 2018

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@paulrouget paulrouget changed the title Reset options on shutdown and make shutdown synchronous [WIP] Reset options on shutdown and make shutdown synchronous Nov 21, 2018
@paulrouget
Copy link
Contributor Author

paulrouget commented Nov 21, 2018 •
edited

There's a mysterious JS crash with that PR that only happens if we wait for shutdown to fully process before starting servo again.

signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0x0
Stack frame #00 pc 04272368  /data/app/org.mozilla.servo-dWx89IRFg47XAEdRgSb2UA==/lib/arm/libsimpleservo.so: Routine JS_NewGlobalObject(JSContext*, JSClass const*, JSPrincipals*, JS::OnNewGlobalHookOption, JS::CompartmentOptions const&) at /Users/paul/.cargo/registry/src/github.com-1ecc6299db9ec823/mozjs_sys-0.61.2/mozjs/js/src/jsapi.cpp:1977 (discriminator 7)

Investigating…
@paulrouget
Copy link
Contributor Author

paulrouget commented Nov 21, 2018

This will help with #22197
@paulrouget paulrouget force-pushed the paulrouget:shutdown2 branch from 1eba309 to bdee74d Nov 22, 2018
@paulrouget paulrouget changed the title [WIP] Reset options on shutdown and make shutdown synchronous shutdown synchronously Nov 22, 2018
@paulrouget
shutdown synchronously
Loading status checks…
799833a
@paulrouget paulrouget force-pushed the paulrouget:shutdown2 branch from bdee74d to 799833a Nov 22, 2018
@paulrouget
Copy link
Contributor Author

paulrouget commented Nov 22, 2018

Ready for review.
@jdm
Copy link
Member

jdm commented Nov 22, 2018

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Nov 22, 2018

📌 Commit 799833a has been approved by jdm
@highfive highfive assigned jdm and unassigned ferjm Nov 22, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Nov 22, 2018

⌛ Testing commit 799833a with merge 06c2dbb...
bors-servo added a commit that referenced this pull request Nov 22, 2018
@bors-servo
Auto merge of #22239 - paulrouget:shutdown2, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
06c2dbb 
shutdown synchronously

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22239)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 22, 2018

💔 Test failed - status-taskcluster
@jdm
Copy link
Member

jdm commented Nov 22, 2018

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Nov 23, 2018

⌛ Testing commit 799833a with merge 7dedee1...
bors-servo added a commit that referenced this pull request Nov 23, 2018
@bors-servo
Auto merge of #22239 - paulrouget:shutdown2, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
7dedee1 
shutdown synchronously

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22239)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 23, 2018

💔 Test failed - linux-dev
@paulrouget
Copy link
Contributor Author

paulrouget commented Nov 23, 2018

Fix #22064
@jdm
Copy link
Member

jdm commented Nov 23, 2018

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Nov 23, 2018

⌛ Testing commit 799833a with merge d7d9015...
bors-servo added a commit that referenced this pull request Nov 23, 2018
@bors-servo
Auto merge of #22239 - paulrouget:shutdown2, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
d7d9015 
shutdown synchronously

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22239)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 23, 2018

☀️ Test successful - android, android-mac, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, magicleap, status-taskcluster, windows-msvc-dev
Approved by: jdm
Pushing d7d9015 to master...
@bors-servo bors-servo merged commit 799833a into servo:master Nov 23, 2018
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@atouchet atouchet mentioned this pull request Nov 23, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@paulrouget @highfive @jdm @bors-servo @ferjm
You can’t perform that action at this time.