Skip to content

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

Merged
bors-servo merged 1 commit intoservo:masterfrom
nox:mitochondria-finally-makes-it-into-the-tree
Jan 23, 2017
Merged

Use mitochondria::OnceCell to store ScriptThread in TLS#15136
bors-servo merged 1 commit intoservo:masterfrom
nox:mitochondria-finally-makes-it-into-the-tree

Conversation

@nox
Copy link
Copy Markdown
Contributor

@nox nox commented Jan 21, 2017 •
edited by larsbergstrom
Loading

This change is Reviewable

@highfive
Copy link
Copy Markdown

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 highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jan 21, 2017
@highfive
Copy link
Copy Markdown

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
Copy Markdown
Member

jdm commented Jan 21, 2017

@bors-servo: r+

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Jan 21, 2017

📌 Commit 8ab0929 has been approved by jdm

@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 Jan 21, 2017
@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Jan 21, 2017

⌛ Testing commit 8ab0929 with merge 0d62b19...

bors-servo pushed a commit that referenced this pull request Jan 21, 2017
Auto merge of #15136 - nox:mitochondria-finally-makes-it-into-the-tre…
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
Copy Markdown
Contributor

bors-servo commented Jan 21, 2017

💔 Test failed - mac-rel-wpt1

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jan 21, 2017
@nox
Copy link
Copy Markdown
Contributor 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
Copy Markdown
Contributor 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 reviewed 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);
Copy link
Copy Markdown
Contributor

@Ms2ger Ms2ger Jan 23, 2017

Choose a reason for hiding this comment

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

Indentation

@nox nox force-pushed the mitochondria-finally-makes-it-into-the-tree branch from 8ab0929 to 2002de4 Compare January 23, 2017 11:16
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Jan 23, 2017
@nox
Copy link
Copy Markdown
Contributor Author

nox commented Jan 23, 2017

@Ms2ger Amended.
@jdm Filed #15151.

@bors-servo r=jdm

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Jan 23, 2017

📌 Commit 2002de4 has been approved by jdm

@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 Jan 23, 2017
@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Jan 23, 2017

⌛ Testing commit 2002de4 with merge ca6376a...

bors-servo pushed a commit that referenced this pull request Jan 23, 2017
Auto merge of #15136 - nox:mitochondria-finally-makes-it-into-the-tre…
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
Copy Markdown
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
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jan 23, 2017
@bors-servo bors-servo mentioned this pull request Jan 23, 2017
Merged
4 tasks
@bors-servo bors-servo mentioned this pull request Jan 23, 2017
Closed
5 tasks
@Ms2ger Ms2ger mentioned this pull request Jan 24, 2017
Merged
@nox nox deleted the mitochondria-finally-makes-it-into-the-tree branch January 24, 2017 10:46
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 pushed a commit that referenced this pull request Jan 24, 2017
Auto merge of #15176 - nox:the-sadness, r=Ms2ger
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
Copy Markdown
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

1 more reviewer

@Ms2ger Ms2ger Ms2ger left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@jdm jdm

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@nox @highfive @jdm @bors-servo @mbrubeck @Ms2ger