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

Shut down the media stack when shutting down the constellation #19225

Merged
merged 1 commit into from
Nov 21, 2017
Merged

Shut down the media stack when shutting down the constellation #19225

merged 1 commit into from
Nov 21, 2017

Conversation

nox
Copy link
Contributor

@nox nox commented Nov 15, 2017 •
edited by SimonSapin

This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @asajeffrey: components/constellation/Cargo.toml, components/constellation/lib.rs, components/constellation/constellation.rs
  • @cbrewster: components/constellation/Cargo.toml, components/constellation/lib.rs, components/constellation/constellation.rs
  • @paulrouget: components/constellation/Cargo.toml, components/constellation/lib.rs, components/constellation/constellation.rs

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Nov 15, 2017
@nox
Copy link
Contributor Author

nox commented Nov 15, 2017

@bors-servo try

This looks like it does nothing, but thanks to servo/gecko-media#69 it actually does.

@bors-servo
Copy link
Contributor

⌛ Trying commit 2b4bb9f with merge 1e7a575...

bors-servo pushed a commit that referenced this pull request Nov 15, 2017
Auto merge of #19225 - servo:media, r=<try>
1e7a575 
Shut down the media stack when shutting down the constellation

<!-- 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/19225)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - linux-dev

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Nov 15, 2017
@nox
Copy link
Contributor Author

nox commented Nov 15, 2017

Linking fails with:

  = note: /home/servo/.cargo/git/checkouts/gecko-media-6bedb392a81eb7cf/0299b45/src/top.rs:302: error: undefined reference to 'GeckoMedia_Initialize'
          /home/servo/.cargo/git/checkouts/gecko-media-6bedb392a81eb7cf/0299b45/src/top.rs:310: error: undefined reference to 'GeckoMedia_Shutdown'
          /home/servo/.cargo/git/checkouts/gecko-media-6bedb392a81eb7cf/0299b45/src/top.rs:323: error: undefined reference to 'GeckoMedia_ProcessEvents'
          /home/servo/.cargo/git/checkouts/gecko-media-6bedb392a81eb7cf/0299b45/src/top.rs:316: error: undefined reference to 'GeckoMedia_CanPlayType'

I have no idea why.

@nox
Copy link
Contributor Author

nox commented Nov 15, 2017

At least, it's consistent and failed on all platforms. Could it be a Servo-specific argument passed to cargo, rustc or the linker that makes the operation fail?

@nox
Copy link
Contributor Author

nox commented Nov 15, 2017

I misread, it only fails on Linux.

@jdm
Copy link
Member

jdm commented Nov 15, 2017 •
edited

While it's broken on linux, this also introduced a new source of intermittent failure in tests on macOS:

  ▶ TIMEOUT [expected PASS] /_mozilla/css/table_caption_top_a.html
  │ 
  │ VMware, Inc.
  │ softpipe
  │ 3.3 (Core Profile) Mesa 17.3.0-devel
  │ Shutting down the Constellation after generating an output file or exit flag specified
  │ VMware, Inc.
  │ softpipe
  │ 3.3 (Core Profile) Mesa 17.3.0-devel
  │ Shutting down the Constellation after generating an output file or exit flag specified
  │ mozilla::detail::MutexImpl::~MutexImpl: pthread_mutex_destroy failed: Resource busy
  │ thread panicked while processing panic. aborting.
  └ thread panicked while processing panic. aborting.

  ▶ TIMEOUT [expected PASS] /css/CSS2/normal-flow/max-width-applies-to-012.xht
  │ 
  │ VMware, Inc.
  │ softpipe
  │ 3.3 (Core Profile) Mesa 17.3.0-devel
  │ Shutting down the Constellation after generating an output file or exit flag specified
  │ mozilla::detail::MutexImpl::~MutexImpl: pthread_mutex_destroy failed: Resource busy
  │ thread panicked while processing panic. aborting.
  └ thread panicked while processing panic. aborting.

@nox nox mentioned this pull request Nov 15, 2017
Open
@highfive highfive removed the S-tests-failed The changes caused existing tests to fail. label Nov 15, 2017
@nox
Copy link
Contributor Author

nox commented Nov 15, 2017

@bors-servo try

@bors-servo
Copy link
Contributor

⌛ Trying commit ffcb9df with merge 912b450...

bors-servo pushed a commit that referenced this pull request Nov 15, 2017
Auto merge of #19225 - servo:media, r=<try>
912b450 
Shut down the media stack when shutting down the constellation

<!-- 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/19225)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - arm64

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Nov 15, 2017
@highfive highfive removed the S-tests-failed The changes caused existing tests to fail. label Nov 15, 2017
@nox
Copy link
Contributor Author

nox commented Nov 16, 2017

@bors-servo try

@bors-servo
Copy link
Contributor

⌛ Trying commit 6df2c49 with merge 3d0853a...

bors-servo pushed a commit that referenced this pull request Nov 16, 2017
Auto merge of #19225 - servo:media, r=<try>
3d0853a 
Shut down the media stack when shutting down the constellation

<!-- 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/19225)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - arm64

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Nov 16, 2017
@highfive highfive removed the S-tests-failed The changes caused existing tests to fail. label Nov 16, 2017
@nox
Copy link
Contributor Author

nox commented Nov 16, 2017

Cfg-gating too hard for me.

@bors-servo try

@bors-servo
Copy link
Contributor

⌛ Trying commit f2cddc5 with merge 02180c0...

bors-servo pushed a commit that referenced this pull request Nov 16, 2017
Auto merge of #19225 - servo:media, r=<try>
02180c0 
Shut down the media stack when shutting down the constellation

<!-- 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/19225)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - linux-rel-wpt

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Nov 16, 2017
@nox
Copy link
Contributor Author

nox commented Nov 16, 2017

thread panicked while processing panic. aborting.

Not a very useful message, but at least there are no linking issues anymore. I'll try to catch panics in gecko-media and see what happens.

@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #19301) made this pull request unmergeable. Please resolve the merge conflicts.

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Nov 20, 2017
@highfive highfive removed the S-tests-failed The changes caused existing tests to fail. label Nov 21, 2017
@nox
Copy link
Contributor Author

nox commented Nov 21, 2017

@bors-servo try

@bors-servo
Copy link
Contributor

⌛ Trying commit 38fd964 with merge f498dc7...

bors-servo pushed a commit that referenced this pull request Nov 21, 2017
Auto merge of #19225 - servo:media, r=<try>
f498dc7 
Shut down the media stack when shutting down the constellation

<!-- 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/19225)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

☀️ Test successful - android, 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, windows-msvc-dev
State: approved= try=True

@nox
Copy link
Contributor Author

nox commented Nov 21, 2017

@jdm r?

@jdm
Copy link
Member

jdm commented Nov 21, 2017

@bors-servo: r+

@bors-servo
Copy link
Contributor

📌 Commit 38fd964 has been approved by jdm

@highfive highfive assigned jdm and unassigned metajack Nov 21, 2017
@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. S-needs-rebase There are merge conflict errors. labels Nov 21, 2017
bors-servo pushed a commit that referenced this pull request Nov 21, 2017
Auto merge of #19225 - servo:media, r=jdm
b13107a 
Shut down the media stack when shutting down the constellation

<!-- 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/19225)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

⌛ Testing commit 38fd964 with merge b13107a...

@bors-servo
Copy link
Contributor

☀️ Test successful - android, 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, windows-msvc-dev
Approved by: jdm
Pushing b13107a to master...

@bors-servo bors-servo merged commit 38fd964 into master Nov 21, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Nov 21, 2017
@jdm jdm mentioned this pull request Nov 23, 2017
Closed
@SimonSapin SimonSapin deleted the media branch December 12, 2017 21:43
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
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@nox @highfive @bors-servo @jdm @metajack