style: Iterate the LRU cache contents from back to front. #15891

emilio · 2017-03-09T16:03:27Z

This is on top of #15888. Only the second commit needs review.

We put the more recently used item last, so iterating then from left to right is
pointless.

This change is

highfive · 2017-03-09T16:03:35Z

Heads up! This PR modifies the following files:

@bholley: components/style/cache.rs, components/style/matching.rs

highfive · 2017-03-09T16:03:36Z

Warning

These commits modify style code, but no tests are modified. Please consider adding a test!

emilio · 2017-03-09T16:03:37Z

r? @SimonSapin or @bholley

bholley · 2017-03-09T20:14:59Z

File an E-Easy for converting this cache to a VecDeque to avoid memmoving each time we need to pop the least-recently-used entry?

@bors-servo delegate+

bors-servo · 2017-03-09T20:15:01Z

✌️ @emilio can now approve this pull request

emilio · 2017-03-09T20:22:48Z

File an E-Easy for converting this cache to a VecDeque to avoid memmoving each time we need to pop the least-recently-used entry?

I don't think that happens a lot of times since we clear it often, but sure.

bors-servo · 2017-03-09T20:26:40Z

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

emilio · 2017-03-09T20:52:20Z

@bors-servo r=bholley

bors-servo · 2017-03-09T20:52:21Z

📌 Commit be42f4b has been approved by bholley

bors-servo · 2017-03-09T20:52:25Z

⌛ Testing commit be42f4b with merge 6280dba...


        Auto merge of #15891 - emilio:lru-back-to-front, r=bholley

style: Iterate the LRU cache contents from back to front. This is on top of #15888. Only the second commit needs review. We put the more recently used item last, so iterating then from left to right is pointless.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15891)

bors-servo · 2017-03-09T21:32:14Z

💔 Test failed - mac-rel-css

emilio · 2017-03-09T23:46:46Z

@bors-servo retry

Subpixel difference near a border corner, huh

bors-servo · 2017-03-09T23:46:51Z

⌛ Testing commit be42f4b with merge 0be18f5...


        Auto merge of #15891 - emilio:lru-back-to-front, r=bholley

style: Iterate the LRU cache contents from back to front. This is on top of #15888. Only the second commit needs review. We put the more recently used item last, so iterating then from left to right is pointless.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15891)

emilio · 2017-03-10T13:11:22Z

@bors-servo try

bors-servo · 2017-03-10T13:11:26Z

⌛ Trying commit eecd38a with merge 3b9a074...


        Auto merge of #15891 - emilio:lru-back-to-front, r=<try>

style: Iterate the LRU cache contents from back to front. This is on top of #15888. Only the second commit needs review. We put the more recently used item last, so iterating then from left to right is pointless.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15891)

bors-servo · 2017-03-10T13:51:35Z

☀️ 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
State: approved= try=True

emilio · 2017-03-10T14:43:19Z

Last commit fixes the reftests failures, I've asked @mbrubeck to take a look.

mbrubeck · 2017-03-10T20:23:57Z

r=mbrubeck for the layout fix

emilio · 2017-03-11T00:13:29Z

@bors-servo r=bholley,mbrubeck

bors-servo · 2017-03-11T00:13:30Z

📌 Commit eecd38a has been approved by bholley,mbrubeck


        style: Iterate the LRU cache contents from back to front.

We put the more recently used item last, so iterating then from left to right is pointless.


        style: Add the traversal kind to the style stats.


        gfx: Show the text in the display item when debugging.


        layout: Reflow some code and comments in layout/inline.rs


        layout: Merge inline nodes based on node address, not node style.

emilio · 2017-03-11T10:31:22Z

@bors-servo r=bholley,mbrubeck

bors-servo · 2017-03-11T10:31:22Z

📌 Commit 4bafded has been approved by bholley,mbrubeck

bors-servo · 2017-03-11T10:31:26Z

⌛ Testing commit 4bafded with merge 7fa4a94...


        Auto merge of #15891 - emilio:lru-back-to-front, r=bholley,mbrubeck

style: Iterate the LRU cache contents from back to front. This is on top of #15888. Only the second commit needs review. We put the more recently used item last, so iterating then from left to right is pointless.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15891)

bors-servo · 2017-03-11T11:11:02Z

☀️ 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
Approved by: bholley,mbrubeck
Pushing 7fa4a94 to master...

highfive assigned Manishearth Mar 9, 2017

highfive added the S-awaiting-review label Mar 9, 2017

highfive assigned SimonSapin and unassigned Manishearth Mar 9, 2017

highfive added the S-needs-rebase label Mar 9, 2017

emilio force-pushed the emilio:lru-back-to-front branch from 5da67e3 to be42f4b Mar 9, 2017

highfive assigned bholley and unassigned SimonSapin Mar 9, 2017

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-rebase labels Mar 9, 2017

highfive added S-tests-failed and removed S-awaiting-merge labels Mar 9, 2017

highfive added S-awaiting-merge and removed S-tests-failed labels Mar 9, 2017

emilio mentioned this pull request Mar 10, 2017

Some reftests rely on how style sharing works. #15907

Open

highfive removed the S-tests-failed label Mar 10, 2017

highfive added S-awaiting-merge and removed S-awaiting-review labels Mar 11, 2017

emilio added 5 commits Mar 9, 2017

style: Iterate the LRU cache contents from back to front.

Unverified

This user has not uploaded their public key yet.

GPG key ID: 056B727BB9C1027C Learn about signing commits

d3e7f1f

We put the more recently used item last, so iterating then from left to right is pointless.

style: Add the traversal kind to the style stats.

Unverified

This user has not uploaded their public key yet.

GPG key ID: 056B727BB9C1027C Learn about signing commits

58c6aad

gfx: Show the text in the display item when debugging.

Unverified

This user has not uploaded their public key yet.

GPG key ID: 056B727BB9C1027C Learn about signing commits

ebdc6f6

layout: Reflow some code and comments in layout/inline.rs

Unverified

This user has not uploaded their public key yet.

GPG key ID: 056B727BB9C1027C Learn about signing commits

6f13489

layout: Merge inline nodes based on node address, not node style.

Unverified

This user has not uploaded their public key yet.

GPG key ID: 056B727BB9C1027C Learn about signing commits

Loading status checks…

4bafded

emilio force-pushed the emilio:lru-back-to-front branch from eecd38a to 4bafded Mar 11, 2017

highfive added S-awaiting-review and removed S-awaiting-merge labels Mar 11, 2017

highfive added S-awaiting-merge and removed S-awaiting-review labels Mar 11, 2017

bors-servo merged commit 4bafded into servo:master Mar 11, 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

highfive removed the S-awaiting-merge label Mar 11, 2017

emilio deleted the emilio:lru-back-to-front branch Mar 23, 2017

servo / servo

style: Iterate the LRU cache contents from back to front. #15891

style: Iterate the LRU cache contents from back to front. #15891

emilio commented Mar 9, 2017 •

edited by larsbergstrom

highfive commented Mar 9, 2017

highfive commented Mar 9, 2017

emilio commented Mar 9, 2017

bholley commented Mar 9, 2017

bors-servo commented Mar 9, 2017

emilio commented Mar 9, 2017

bors-servo commented Mar 9, 2017

emilio commented Mar 9, 2017

bors-servo commented Mar 9, 2017

bors-servo commented Mar 9, 2017

bors-servo commented Mar 9, 2017

emilio commented Mar 9, 2017

bors-servo commented Mar 9, 2017

emilio commented Mar 10, 2017

bors-servo commented Mar 10, 2017

bors-servo commented Mar 10, 2017

emilio commented Mar 10, 2017

mbrubeck commented Mar 10, 2017

emilio commented Mar 11, 2017

bors-servo commented Mar 11, 2017

emilio commented Mar 11, 2017

bors-servo commented Mar 11, 2017

bors-servo commented Mar 11, 2017

bors-servo commented Mar 11, 2017

servo / servo

Join GitHub today

style: Iterate the LRU cache contents from back to front. #15891

style: Iterate the LRU cache contents from back to front. #15891

Conversation

emilio commented Mar 9, 2017 • edited by larsbergstrom

highfive commented Mar 9, 2017

highfive commented Mar 9, 2017

emilio commented Mar 9, 2017

bholley commented Mar 9, 2017

bors-servo commented Mar 9, 2017

emilio commented Mar 9, 2017

bors-servo commented Mar 9, 2017

emilio commented Mar 9, 2017

bors-servo commented Mar 9, 2017

bors-servo commented Mar 9, 2017

bors-servo commented Mar 9, 2017

emilio commented Mar 9, 2017

bors-servo commented Mar 9, 2017

emilio commented Mar 10, 2017

bors-servo commented Mar 10, 2017

bors-servo commented Mar 10, 2017

emilio commented Mar 10, 2017

mbrubeck commented Mar 10, 2017

emilio commented Mar 11, 2017

bors-servo commented Mar 11, 2017

emilio commented Mar 11, 2017

bors-servo commented Mar 11, 2017

bors-servo commented Mar 11, 2017

bors-servo commented Mar 11, 2017

emilio commented Mar 9, 2017 •

edited by larsbergstrom