[go: nahoru, domu]
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

core: refactor check for clearing cache #9896

Merged
merged 5 commits into from
Oct 30, 2019
Merged

core: refactor check for clearing cache #9896

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f326cb6
core: refactor check for clearing cache
connorjclark Oct 28, 2019
5acbc2c
ws
connorjclark Oct 28, 2019
41dfd43
Merge remote-tracking branch 'origin/master' into is-perf-pass
connorjclark Oct 30, 2019
aeda62d
just rename
connorjclark Oct 30, 2019
06c3539
comment
connorjclark Oct 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions lighthouse-core/gather/gather-runner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,8 +602,17 @@ class GatherRunner {
* @return {boolean}
*/
static isPerfPass(passContext) {
const {settings, passConfig} = passContext;
return !settings.disableStorageReset && passConfig.recordTrace && passConfig.useThrottling;
const {passConfig} = passContext;
return passConfig.recordTrace && passConfig.useThrottling;
}

/**
* Returns whether this pass should clear the cache.
* @param {LH.Gatherer.PassContext} passContext
* @return {boolean}
*/
static shouldClearCache(passContext) {
return !passContext.settings.disableStorageReset && GatherRunner.isPerfPass(passContext);
}

/**
Expand Down Expand Up @@ -631,8 +640,7 @@ class GatherRunner {
// Go to about:blank, set up, and run `beforePass()` on gatherers.
await GatherRunner.loadBlank(driver, passConfig.blankPage);
await GatherRunner.setupPassNetwork(passContext);
const isPerfPass = GatherRunner.isPerfPass(passContext);
if (isPerfPass) await driver.cleanBrowserCaches(); // Clear disk & memory cache if it's a perf run
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Also, this comment was not useful.

Copy link
Collaborator

Choose a reason for hiding this comment

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

it is indeed a relic of a time when gather-runner was inscrutable and lines needed to be explained, but a reminder that it's intended to be disk and memory cache seems somewhat useful to me :)

honestly though I'm not sure why this isn't in setupPassNetwork since it's exactly supposed to set the network state

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Clear disk & memory cache if it's a perf run says three things:

  1. clear disk cache
  2. clear memory cache
  3. do these things only if perf run

all of which is readily apparent, either via the short jsdocs or the names of these methods.

this is getting nitty so I just put it back. Just doing the rename.

Copy link
Collaborator

Choose a reason for hiding this comment

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

fwiw I wasn't trying to argue that it must stay, just wanted to support why it existed and that it's not 100% devoid of value :)

but it's w/e

if (GatherRunner.shouldClearCache(passContext)) await driver.cleanBrowserCaches();
await GatherRunner.beforePass(passContext, gathererResults);

// Navigate, start recording, and run `pass()` on gatherers.
Expand Down