Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(966)

Unified Diff: chrome/app/main_dll_loader_win.cc

Issue 1610733002: Store PreRead options obtained from the registry in a global variable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: don't return a const ref Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/startup_metric_utils/common/pre_read_field_trial_utils_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/main_dll_loader_win.cc
diff --git a/chrome/app/main_dll_loader_win.cc b/chrome/app/main_dll_loader_win.cc
index a70a6787d1504d0f2ce48b52ae09ce9325ac2f9b..f28d301738abac4b1db94e24a0c969f6c57d6f0d 100644
--- a/chrome/app/main_dll_loader_win.cc
+++ b/chrome/app/main_dll_loader_win.cc
@@ -64,35 +64,31 @@ HMODULE LoadModuleWithDirectory(const base::FilePath& module) {
::SetCurrentDirectoryW(module.DirName().value().c_str());
// Get pre-read options from the PreRead field trial.
- bool trial_no_pre_read = false;
- bool trial_high_priority = false;
- bool trial_only_if_cold = false;
- bool trial_prefetch_virtual_memory = false;
- startup_metric_utils::GetPreReadOptions(
- BrowserDistribution::GetDistribution()->GetRegistryPath(),
- &trial_no_pre_read, &trial_high_priority, &trial_only_if_cold,
- &trial_prefetch_virtual_memory);
+ startup_metric_utils::InitializePreReadOptions(
+ BrowserDistribution::GetDistribution()->GetRegistryPath());
+ const startup_metric_utils::PreReadOptions pre_read_options =
+ startup_metric_utils::GetPreReadOptions();
// Pre-read the binary to warm the memory caches (avoids a lot of random IO).
- if (!trial_no_pre_read) {
+ if (!pre_read_options.no_pre_read) {
base::ThreadPriority previous_priority = base::ThreadPriority::NORMAL;
- if (trial_high_priority) {
+ if (pre_read_options.high_priority) {
previous_priority = base::PlatformThread::GetCurrentThreadPriority();
base::PlatformThread::SetCurrentThreadPriority(
base::ThreadPriority::DISPLAY);
}
- if (trial_only_if_cold) {
+ if (pre_read_options.only_if_cold) {
base::MemoryMappedFile module_memory_map;
const bool map_initialize_success = module_memory_map.Initialize(module);
DCHECK(map_initialize_success);
if (!IsMemoryMappedFileWarm(module_memory_map)) {
- if (trial_prefetch_virtual_memory)
+ if (pre_read_options.prefetch_virtual_memory)
PreReadMemoryMappedFile(module_memory_map, module);
else
PreReadFile(module);
}
- } else if (trial_prefetch_virtual_memory) {
+ } else if (pre_read_options.prefetch_virtual_memory) {
base::MemoryMappedFile module_memory_map;
const bool map_initialize_success = module_memory_map.Initialize(module);
DCHECK(map_initialize_success);
@@ -101,7 +97,7 @@ HMODULE LoadModuleWithDirectory(const base::FilePath& module) {
PreReadFile(module);
}
- if (trial_high_priority)
+ if (pre_read_options.high_priority)
base::PlatformThread::SetCurrentThreadPriority(previous_priority);
}
« no previous file with comments | « no previous file | components/startup_metric_utils/common/pre_read_field_trial_utils_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698