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

Use mitochondria::OnceCell to store ScriptThread in TLS #15136

Merged
merged 1 commit into from Jan 23, 2017
Merged

Use mitochondria::OnceCell to store ScriptThread in TLS #15136

merged 1 commit into from Jan 23, 2017

Conversation

@nox
Copy link
Member

nox commented Jan 21, 2017 •
edited by larsbergstrom

This change is Reviewable
@highfive
Copy link

highfive commented Jan 21, 2017

Heads up! This PR modifies the following files:

  • @fitzgen: components/script/script_thread.rs, components/script/Cargo.toml, components/script/lib.rs
  • @KiChjang: components/script/script_thread.rs, components/script/Cargo.toml, components/script/lib.rs
@highfive
Copy link

highfive commented Jan 21, 2017

warning Warning warning

  • These commits modify script code, but no tests are modified. Please consider adding a test!
@jdm
Copy link
Member

jdm commented Jan 21, 2017

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

bors-servo commented Jan 21, 2017

📌 Commit 8ab0929 has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Jan 21, 2017

⌛ Testing commit 8ab0929 with merge 0d62b19...
bors-servo added a commit that referenced this pull request Jan 21, 2017
@bors-servo
Auto merge of #15136 - nox:mitochondria-finally-makes-it-into-the-tre…
Loading status checks…
0d62b19 
…e, r=jdm

Use mitochondria::OnceCell to store ScriptThread in TLS

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

bors-servo commented Jan 21, 2017

💔 Test failed - mac-rel-wpt1
@nox
Copy link
Member Author

nox commented Jan 21, 2017 

Tests with unexpected results:
  ▶ TIMEOUT [expected ERROR] /navigation-timing/nav2_test_unloadEvents_previous_document_cross_origin.html
  │ 
  │ VMware, Inc.
  │ Gallium 0.4 on softpipe
  └ 3.3 (Core Profile) Mesa 12.0.1
@nox
Copy link
Member Author

nox commented Jan 21, 2017

Checked locally, this seems to be a new intermittent. Should I just file it as such, @jdm?
@Ms2ger
Ms2ger reviewed Jan 23, 2017
View changes
components/script/script_thread.rs Outdated
script_thread.start_page_load(new_load, load_data);
let origin = Origin::new(&load_data.url);
let new_load = InProgressLoad::new(id, frame_id, parent_info, layout_chan, window_size,
load_data.url.clone(), origin);

This comment has been minimized.

Sign in to view
Copy link
@Ms2ger

Ms2ger Jan 23, 2017

Contributor

Indentation
@nox
Use mitochondria::OnceCell to store ScriptThread in TLS
Loading status checks…
2002de4
@nox nox force-pushed the nox:mitochondria-finally-makes-it-into-the-tree branch from 8ab0929 to 2002de4 Jan 23, 2017
@nox
Copy link
Member Author

nox commented Jan 23, 2017

@Ms2ger Amended.
@jdm Filed #15151.

@bors-servo r=jdm
@bors-servo
Copy link
Contributor

bors-servo commented Jan 23, 2017

📌 Commit 2002de4 has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Jan 23, 2017

⌛ Testing commit 2002de4 with merge ca6376a...
bors-servo added a commit that referenced this pull request Jan 23, 2017
@bors-servo
Auto merge of #15136 - nox:mitochondria-finally-makes-it-into-the-tre…
Loading status checks…
ca6376a 
…e, r=jdm

Use mitochondria::OnceCell to store ScriptThread in TLS

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

bors-servo commented Jan 23, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-gnu-dev, windows-msvc-dev
@bors-servo bors-servo merged commit 2002de4 into servo:master Jan 23, 2017
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
@bors-servo bors-servo mentioned this pull request Jan 23, 2017
Merged
4 of 4 tasks complete
@bors-servo bors-servo mentioned this pull request Jan 23, 2017
Closed
4 of 5 tasks complete
@Ms2ger Ms2ger mentioned this pull request Jan 24, 2017
Merged
@nox nox deleted the nox:mitochondria-finally-makes-it-into-the-tree branch Jan 24, 2017
nox added a commit to nox/servo that referenced this pull request Jan 24, 2017
@nox
Revert "Auto merge of servo#15136 - nox:mitochondria-finally-makes-it…
f1738ee 
…-into-the-tree, r=jdm"

This reverts commit ca6376a, reversing
changes made to bb24fd3.
bors-servo added a commit that referenced this pull request Jan 24, 2017
@bors-servo
Auto merge of #15176 - nox:the-sadness, r=Ms2ger
Loading status checks…
8382aaa 
Revert "Auto merge of #15136 - nox:mitochondria-finally-makes-it-into…

<!-- 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/15176)
<!-- Reviewable:end -->
@mbrubeck
Copy link
Contributor

mbrubeck commented Jan 24, 2017

Reverted in #15176 in an attempt to fix #15161.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ms2ger Ms2ger

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

6 participants
@nox @highfive @jdm @bors-servo @mbrubeck @Ms2ger
You can’t perform that action at this time.