Skip to content

GitLab

T
tangled
Commit 9c7eb447 authored by rkaplow's avatar rkaplow Committed by Commit bot
Browse files
Options

Add extra histogram latency tracking in PreMainMessageLoopRunImpl. 

BUG=454789

Review URL: https://codereview.chromium.org/957353003

Cr-Commit-Position: refs/heads/master@{#318806}
parent 5342c252
Show whitespace changes
Inline Side-by-side
Showing with 114 additions and 64 deletions
chrome/browser/chrome_browser_main.cc
View file @ 9c7eb447
...@@ -144,18 +144,18 @@ ...@@ -144,18 +144,18 @@
#include "chrome/browser/metrics/thread_watcher_android.h" #include "chrome/browser/metrics/thread_watcher_android.h"
#else #else
#include "chrome/browser/feedback/feedback_profile_observer.h" #include "chrome/browser/feedback/feedback_profile_observer.h"
#endif #endif // defined(OS_ANDROID)
#if defined(OS_LINUX) && !defined(OS_CHROMEOS) #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
#include "chrome/browser/first_run/upgrade_util_linux.h" #include "chrome/browser/first_run/upgrade_util_linux.h"
#include "chrome/browser/sxs_linux.h" #include "chrome/browser/sxs_linux.h"
#endif #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chromeos/chromeos_switches.h" #include "chromeos/chromeos_switches.h"
#include "chromeos/settings/cros_settings_names.h" #include "chromeos/settings/cros_settings_names.h"
#endif #endif // defined(OS_CHROMEOS)
// TODO(port): several win-only methods have been pulled out of this, but // TODO(port): several win-only methods have been pulled out of this, but
// BrowserMain() as a whole needs to be broken apart so that it's usable by // BrowserMain() as a whole needs to be broken apart so that it's usable by
...@@ -188,38 +188,38 @@ ...@@ -188,38 +188,38 @@
#include "base/mac/scoped_nsautorelease_pool.h" #include "base/mac/scoped_nsautorelease_pool.h"
#include "chrome/browser/mac/keystone_glue.h" #include "chrome/browser/mac/keystone_glue.h"
#endif #endif // defined(OS_MACOSX)
#if !defined(OS_IOS) #if !defined(OS_IOS)
#include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h" #include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h"
#endif #endif // !defined(OS_IOS)
#if !defined(DISABLE_NACL) #if !defined(DISABLE_NACL)
#include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h"
#include "components/nacl/browser/nacl_process_host.h" #include "components/nacl/browser/nacl_process_host.h"
#endif #endif // !defined(DISABLE_NACL)
#if defined(ENABLE_EXTENSIONS) #if defined(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/startup_helper.h" #include "chrome/browser/extensions/startup_helper.h"
#include "extensions/browser/extension_protocols.h" #include "extensions/browser/extension_protocols.h"
#include "extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.h" #include "extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.h"
#endif #endif // defined(ENABLE_EXTENSIONS)
#if defined(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) #if defined(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD)
#include "printing/printed_document.h" #include "printing/printed_document.h"
#endif #endif // defined(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD)
#if defined(ENABLE_RLZ) #if defined(ENABLE_RLZ)
#include "chrome/browser/rlz/rlz.h" #include "chrome/browser/rlz/rlz.h"
#endif #endif // defined(ENABLE_RLZ)
#if defined(ENABLE_WEBRTC) #if defined(ENABLE_WEBRTC)
#include "chrome/browser/media/webrtc_log_util.h" #include "chrome/browser/media/webrtc_log_util.h"
#endif #endif // defined(ENABLE_WEBRTC)
#if defined(USE_AURA) #if defined(USE_AURA)
#include "ui/aura/env.h" #include "ui/aura/env.h"
#endif #endif // defined(USE_AURA)
using content::BrowserThread; using content::BrowserThread;
...@@ -318,7 +318,7 @@ PrefService* InitializeLocalState( ...@@ -318,7 +318,7 @@ PrefService* InitializeLocalState(
local_state->SetString(prefs::kApplicationLocale, owner_locale); local_state->SetString(prefs::kApplicationLocale, owner_locale);
} }
} }
#endif #endif // defined(OS_CHROMEOS)
return local_state; return local_state;
} }
...@@ -379,7 +379,7 @@ Profile* CreatePrimaryProfile(const content::MainFunctionParams& parameters, ...@@ -379,7 +379,7 @@ Profile* CreatePrimaryProfile(const content::MainFunctionParams& parameters,
profile = g_browser_process->profile_manager()->GetProfile( profile = g_browser_process->profile_manager()->GetProfile(
ProfileManager::GetGuestProfilePath()); ProfileManager::GetGuestProfilePath());
} }
#endif #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID)
if (profile) { if (profile) {
UMA_HISTOGRAM_LONG_TIMES( UMA_HISTOGRAM_LONG_TIMES(
"Startup.CreateFirstProfile", base::Time::Now() - start); "Startup.CreateFirstProfile", base::Time::Now() - start);
...@@ -391,7 +391,7 @@ Profile* CreatePrimaryProfile(const content::MainFunctionParams& parameters, ...@@ -391,7 +391,7 @@ Profile* CreatePrimaryProfile(const content::MainFunctionParams& parameters,
// user_data_dir. It is better to CHECK-fail here than it is to // user_data_dir. It is better to CHECK-fail here than it is to
// silently exit because of missing code in the above test. // silently exit because of missing code in the above test.
CHECK(profile) << "Cannot get default profile."; CHECK(profile) << "Cannot get default profile.";
#endif #endif // !defined(OS_WIN)
return NULL; return NULL;
} }
...@@ -401,7 +401,7 @@ OSStatus KeychainCallback(SecKeychainEvent keychain_event, ...@@ -401,7 +401,7 @@ OSStatus KeychainCallback(SecKeychainEvent keychain_event,
SecKeychainCallbackInfo* info, void* context) { SecKeychainCallbackInfo* info, void* context) {
return noErr; return noErr;
} }
#endif #endif // defined(OS_MACOSX)
void RegisterComponentsForUpdate() { void RegisterComponentsForUpdate() {
component_updater::ComponentUpdateService* cus = component_updater::ComponentUpdateService* cus =
...@@ -415,7 +415,7 @@ void RegisterComponentsForUpdate() { ...@@ -415,7 +415,7 @@ void RegisterComponentsForUpdate() {
RegisterPepperFlashComponent(cus); RegisterPepperFlashComponent(cus);
RegisterSwiftShaderComponent(cus); RegisterSwiftShaderComponent(cus);
RegisterWidevineCdmComponent(cus); RegisterWidevineCdmComponent(cus);
#endif #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
#if !defined(DISABLE_NACL) && !defined(OS_ANDROID) #if !defined(DISABLE_NACL) && !defined(OS_ANDROID)
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
...@@ -423,9 +423,9 @@ void RegisterComponentsForUpdate() { ...@@ -423,9 +423,9 @@ void RegisterComponentsForUpdate() {
// Chrome4ChromeOS on Linux doesn't contain PNaCl so enable component // Chrome4ChromeOS on Linux doesn't contain PNaCl so enable component
// installer when running on Linux. See crbug.com/422121 for more details. // installer when running on Linux. See crbug.com/422121 for more details.
if (!base::SysInfo::IsRunningOnChromeOS()) if (!base::SysInfo::IsRunningOnChromeOS())
#endif #endif // defined(OS_CHROMEOS)
g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(cus); g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(cus);
#endif #endif // !defined(DISABLE_NACL) && !defined(OS_ANDROID)
// Registration of the CLD Component is a no-op unless the CLD data source has // Registration of the CLD Component is a no-op unless the CLD data source has
// been configured to be the "Component" data source. // been configured to be the "Component" data source.
...@@ -450,13 +450,13 @@ void RegisterComponentsForUpdate() { ...@@ -450,13 +450,13 @@ void RegisterComponentsForUpdate() {
// 1. Android: Because it currently does not have the EV indicator. // 1. Android: Because it currently does not have the EV indicator.
// 2. Chrome OS: On Chrome OS this registration is delayed until user login. // 2. Chrome OS: On Chrome OS this registration is delayed until user login.
RegisterEVWhitelistComponent(cus, path); RegisterEVWhitelistComponent(cus, path);
#endif #endif // defined(OS_ANDROID)
} }
#if defined(OS_WIN) #if defined(OS_WIN)
RegisterSwReporterComponent(cus, g_browser_process->local_state()); RegisterSwReporterComponent(cus, g_browser_process->local_state());
RegisterCAPSComponent(cus); RegisterCAPSComponent(cus);
#endif #endif // defined(OS_WIN)
cus->Start(); cus->Start();
} }
...@@ -471,7 +471,7 @@ bool ProcessSingletonNotificationCallback( ...@@ -471,7 +471,7 @@ bool ProcessSingletonNotificationCallback(
browser_watcher::ExitFunnel::RecordSingleEvent( browser_watcher::ExitFunnel::RecordSingleEvent(
chrome::kBrowserExitCodesRegistryPath, chrome::kBrowserExitCodesRegistryPath,
L"ProcessSingletonIsShuttingDown"); L"ProcessSingletonIsShuttingDown");
#endif #endif // defined(OS_WIN)
return false; return false;
} }
...@@ -556,13 +556,13 @@ namespace chrome_browser { ...@@ -556,13 +556,13 @@ namespace chrome_browser {
// localization data files. // localization data files.
#if defined(OS_WIN) #if defined(OS_WIN)
const char kMissingLocaleDataTitle[] = "Missing File Error"; const char kMissingLocaleDataTitle[] = "Missing File Error";
#endif #endif // defined(OS_WIN)
#if defined(OS_WIN) #if defined(OS_WIN)
// TODO(port) This should be used on Linux Aura as well. http://crbug.com/338969 // TODO(port) This should be used on Linux Aura as well. http://crbug.com/338969
const char kMissingLocaleDataMessage[] = const char kMissingLocaleDataMessage[] =
"Unable to find locale data files. Please reinstall."; "Unable to find locale data files. Please reinstall.";
#endif #endif // defined(OS_WIN)
} // namespace chrome_browser } // namespace chrome_browser
...@@ -702,7 +702,7 @@ void ChromeBrowserMainParts::RecordBrowserStartupTime() { ...@@ -702,7 +702,7 @@ void ChromeBrowserMainParts::RecordBrowserStartupTime() {
bool is_first_run = false; bool is_first_run = false;
#else #else
bool is_first_run = first_run::IsChromeFirstRun(); bool is_first_run = first_run::IsChromeFirstRun();
#endif #endif // defined(OS_ANDROID)
// CurrentProcessInfo::CreationTime() is currently only implemented on some // CurrentProcessInfo::CreationTime() is currently only implemented on some
// platforms. // platforms.
...@@ -787,7 +787,7 @@ int ChromeBrowserMainParts::PreCreateThreads() { ...@@ -787,7 +787,7 @@ int ChromeBrowserMainParts::PreCreateThreads() {
// These members must be initialized before exiting this function normally. // These members must be initialized before exiting this function normally.
DCHECK(master_prefs_.get()); DCHECK(master_prefs_.get());
DCHECK(browser_creator_.get()); DCHECK(browser_creator_.get());
#endif #endif // !defined(OS_ANDROID)
for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
chrome_extra_parts_[i]->PreCreateThreads(); chrome_extra_parts_[i]->PreCreateThreads();
} }
...@@ -800,7 +800,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { ...@@ -800,7 +800,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
run_message_loop_ = false; run_message_loop_ = false;
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
chrome::MaybeShowInvalidUserDataDirWarningDialog(); chrome::MaybeShowInvalidUserDataDirWarningDialog();
#endif #endif // !defined(OS_ANDROID)
if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir_)) if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir_))
return chrome::RESULT_CODE_MISSING_DATA; return chrome::RESULT_CODE_MISSING_DATA;
...@@ -814,7 +814,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { ...@@ -814,7 +814,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// Cache first run state early. // Cache first run state early.
first_run::IsChromeFirstRun(); first_run::IsChromeFirstRun();
#endif #endif // !defined(OS_ANDROID)
scoped_refptr<base::SequencedTaskRunner> local_state_task_runner = scoped_refptr<base::SequencedTaskRunner> local_state_task_runner =
JsonPrefStore::GetTaskRunnerForFile( JsonPrefStore::GetTaskRunnerForFile(
...@@ -860,7 +860,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { ...@@ -860,7 +860,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_.reset(new StartupBrowserCreator); browser_creator_.reset(new StartupBrowserCreator);
// TODO(yfriedman): Refactor Android to re-use UMABrowsingActivityObserver // TODO(yfriedman): Refactor Android to re-use UMABrowsingActivityObserver
chrome::UMABrowsingActivityObserver::Init(); chrome::UMABrowsingActivityObserver::Init();
#endif #endif // !defined(OS_ANDROID)
#if !defined(OS_CHROMEOS) #if !defined(OS_CHROMEOS)
// Convert active labs into switches. This needs to be done before // Convert active labs into switches. This needs to be done before
...@@ -877,7 +877,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { ...@@ -877,7 +877,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
base::CommandLine::ForCurrentProcess(), base::CommandLine::ForCurrentProcess(),
about_flags::kAddSentinels); about_flags::kAddSentinels);
} }
#endif #endif // !defined(OS_CHROMEOS)
local_state_->UpdateCommandLinePrefStore( local_state_->UpdateCommandLinePrefStore(
new CommandLinePrefStore(base::CommandLine::ForCurrentProcess())); new CommandLinePrefStore(base::CommandLine::ForCurrentProcess()));
...@@ -982,13 +982,13 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { ...@@ -982,13 +982,13 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
master_prefs_->suppress_default_browser_prompt_for_version); master_prefs_->suppress_default_browser_prompt_for_version);
} }
} }
#endif #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX)
// Set the product channel for crash reports. // Set the product channel for crash reports.
base::debug::SetCrashKeyValue(crash_keys::kChannel, base::debug::SetCrashKeyValue(crash_keys::kChannel,
chrome::VersionInfo::GetVersionStringModifier()); chrome::VersionInfo::GetVersionStringModifier());
#endif #endif // defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX)
// Initialize tracking synchronizer system. // Initialize tracking synchronizer system.
tracking_synchronizer_ = new metrics::TrackingSynchronizer(); tracking_synchronizer_ = new metrics::TrackingSynchronizer();
...@@ -1001,13 +1001,13 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { ...@@ -1001,13 +1001,13 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// (Note that the callback mask here is empty. I don't want to register for // (Note that the callback mask here is empty. I don't want to register for
// any callbacks, I just want to initialize the mechanism.) // any callbacks, I just want to initialize the mechanism.)
SecKeychainAddCallback(&KeychainCallback, 0, NULL); SecKeychainAddCallback(&KeychainCallback, 0, NULL);
#endif #endif // defined(OS_MACOSX)
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
// Must be done after g_browser_process is constructed, before // Must be done after g_browser_process is constructed, before
// SetupMetricsAndFieldTrials(). // SetupMetricsAndFieldTrials().
chromeos::CrosSettings::Initialize(); chromeos::CrosSettings::Initialize();
#endif #endif // defined(OS_CHROMEOS)
// Now the command line has been mutated based on about:flags, we can setup // Now the command line has been mutated based on about:flags, we can setup
// metrics and initialize field trials. The field trials are needed by // metrics and initialize field trials. The field trials are needed by
...@@ -1073,15 +1073,15 @@ void ChromeBrowserMainParts::PreProfileInit() { ...@@ -1073,15 +1073,15 @@ void ChromeBrowserMainParts::PreProfileInit() {
BrowserThread::FILE, FROM_HERE, BrowserThread::FILE, FROM_HERE,
base::Bind(&ProfileManager::CleanUpStaleProfiles, profiles_to_delete)); base::Bind(&ProfileManager::CleanUpStaleProfiles, profiles_to_delete));
} }
#endif // OS_ANDROID #endif // !defined(OS_ANDROID)
#if defined(ENABLE_EXTENSIONS) #if defined(ENABLE_EXTENSIONS)
javascript_dialog_extensions_client::InstallClient(); javascript_dialog_extensions_client::InstallClient();
#endif #endif // defined(ENABLE_EXTENSIONS)
#if !defined(OS_IOS) #if !defined(OS_IOS)
InstallChromeJavaScriptNativeDialogFactory(); InstallChromeJavaScriptNativeDialogFactory();
#endif #endif // !defined(OS_IOS)
} }
void ChromeBrowserMainParts::PostProfileInit() { void ChromeBrowserMainParts::PostProfileInit() {
...@@ -1106,7 +1106,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { ...@@ -1106,7 +1106,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
// Allow ProcessSingleton to process messages. // Allow ProcessSingleton to process messages.
process_singleton_->Unlock(); process_singleton_->Unlock();
#endif #endif // !defined(OS_ANDROID)
#if defined(ENABLE_WEBRTC) #if defined(ENABLE_WEBRTC)
// Set up a task to delete old WebRTC log files for all profiles. Use a delay // Set up a task to delete old WebRTC log files for all profiles. Use a delay
// to reduce the impact on startup time. // to reduce the impact on startup time.
...@@ -1115,18 +1115,19 @@ void ChromeBrowserMainParts::PostBrowserStart() { ...@@ -1115,18 +1115,19 @@ void ChromeBrowserMainParts::PostBrowserStart() {
FROM_HERE, FROM_HERE,
base::Bind(&WebRtcLogUtil::DeleteOldWebRtcLogFilesForAllProfiles), base::Bind(&WebRtcLogUtil::DeleteOldWebRtcLogFilesForAllProfiles),
base::TimeDelta::FromMinutes(1)); base::TimeDelta::FromMinutes(1));
#endif #endif // defined(ENABLE_WEBRTC)
} }
int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreMainMessageLoopRunImpl"); TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreMainMessageLoopRunImpl");
SCOPED_UMA_HISTOGRAM_LONG_TIMER("Startup.PreMainMessageLoopRunImplLongTime"); SCOPED_UMA_HISTOGRAM_LONG_TIMER("Startup.PreMainMessageLoopRunImplLongTime");
const base::TimeTicks start_time_step1 = base::TimeTicks::Now();
// Android updates the metrics service dynamically depending on whether the // Android updates the metrics service dynamically depending on whether the
// application is in the foreground or not. Do not start here. // application is in the foreground or not. Do not start here.
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
// Now that the file thread has been started, start recording. // Now that the file thread has been started, start recording.
StartMetricsRecording(); StartMetricsRecording();
#endif #endif // !defined(OS_ANDROID)
if (!base::debug::BeingDebugged()) { if (!base::debug::BeingDebugged()) {
// Create watchdog thread after creating all other threads because it will // Create watchdog thread after creating all other threads because it will
...@@ -1161,7 +1162,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ...@@ -1161,7 +1162,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
ui::SelectFileDialog::SetFactory(new ChromeSelectFileDialogFactory( ui::SelectFileDialog::SetFactory(new ChromeSelectFileDialogFactory(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))); BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
#endif #endif // defined(OS_WIN)
if (parsed_command_line().HasSwitch(switches::kMakeDefaultBrowser)) { if (parsed_command_line().HasSwitch(switches::kMakeDefaultBrowser)) {
return ShellIntegration::SetAsDefaultBrowser() ? return ShellIntegration::SetAsDefaultBrowser() ?
...@@ -1172,7 +1173,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ...@@ -1172,7 +1173,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
#if defined(USE_AURA) #if defined(USE_AURA)
// Make sure aura::Env has been initialized. // Make sure aura::Env has been initialized.
CHECK(aura::Env::GetInstance()); CHECK(aura::Env::GetInstance());
#endif #endif // defined(USE_AURA)
// Android doesn't support extensions and doesn't implement ProcessSingleton. // Android doesn't support extensions and doesn't implement ProcessSingleton.
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
...@@ -1203,9 +1204,11 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ...@@ -1203,9 +1204,11 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
case ProcessSingleton::PROCESS_NOTIFIED: case ProcessSingleton::PROCESS_NOTIFIED:
#if defined(OS_POSIX) && !defined(OS_MACOSX) #if defined(OS_POSIX) && !defined(OS_MACOSX)
// On POSIX systems, print a message notifying the process is running.
printf("%s\n", base::SysWideToNativeMB(base::UTF16ToWide( printf("%s\n", base::SysWideToNativeMB(base::UTF16ToWide(
l10n_util::GetStringUTF16(IDS_USED_EXISTING_BROWSER))).c_str()); l10n_util::GetStringUTF16(IDS_USED_EXISTING_BROWSER))).c_str());
#endif #endif // defined(OS_POSIX) && !defined(OS_MACOSX)
// Having a differentiated return type for testing allows for tests to // Having a differentiated return type for testing allows for tests to
// verify proper handling of some switches. When not testing, stick to // verify proper handling of some switches. When not testing, stick to
// the standard Unix convention of returning zero when things went as // the standard Unix convention of returning zero when things went as
...@@ -1293,6 +1296,12 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ...@@ -1293,6 +1296,12 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
metrics::MetricsService::SetExecutionPhase( metrics::MetricsService::SetExecutionPhase(
metrics::MetricsService::CREATE_PROFILE, metrics::MetricsService::CREATE_PROFILE,
g_browser_process->local_state()); g_browser_process->local_state());
UMA_HISTOGRAM_TIMES("Startup.PreMainMessageLoopRunImplStep1Time",
base::TimeTicks::Now() - start_time_step1);
// This step is costly and is already measured in Startup.CreateFirstProfile
// and more directly Profile.CreateAndInitializeProfile.
profile_ = CreatePrimaryProfile(parameters(), profile_ = CreatePrimaryProfile(parameters(),
user_data_dir_, user_data_dir_,
parsed_command_line()); parsed_command_line());
...@@ -1300,6 +1309,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ...@@ -1300,6 +1309,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
return content::RESULT_CODE_NORMAL_EXIT; return content::RESULT_CODE_NORMAL_EXIT;
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
const base::TimeTicks start_time_step2 = base::TimeTicks::Now();
// The first run sentinel must be created after the process singleton was // The first run sentinel must be created after the process singleton was
// grabbed and no early return paths were otherwise hit above. // grabbed and no early return paths were otherwise hit above.
first_run::CreateSentinelIfNeeded(); first_run::CreateSentinelIfNeeded();
...@@ -1309,7 +1319,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ...@@ -1309,7 +1319,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
// Autoload any profiles which are running background apps. // Autoload any profiles which are running background apps.
// TODO(rlp): Do this on a separate thread. See http://crbug.com/99075. // TODO(rlp): Do this on a separate thread. See http://crbug.com/99075.
browser_process_->profile_manager()->AutoloadProfiles(); browser_process_->profile_manager()->AutoloadProfiles();
#endif #endif // defined(ENABLE_BACKGROUND)
// Post-profile init --------------------------------------------------------- // Post-profile init ---------------------------------------------------------
TranslateService::Initialize(); TranslateService::Initialize();
...@@ -1325,7 +1335,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ...@@ -1325,7 +1335,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
NaClBrowserDelegateImpl* delegate = NaClBrowserDelegateImpl* delegate =
new NaClBrowserDelegateImpl(browser_process_->profile_manager()); new NaClBrowserDelegateImpl(browser_process_->profile_manager());
nacl::NaClBrowser::SetDelegate(delegate); nacl::NaClBrowser::SetDelegate(delegate);
#endif #endif // !defined(DISABLE_NACL)
// TODO(stevenjb): Move WIN and MACOSX specific code to appropriate Parts. // TODO(stevenjb): Move WIN and MACOSX specific code to appropriate Parts.
// (requires supporting early exit). // (requires supporting early exit).
...@@ -1389,7 +1399,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ...@@ -1389,7 +1399,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
base::Bind(&NetworkProfileBubble::CheckNetworkProfile, base::Bind(&NetworkProfileBubble::CheckNetworkProfile,
profile_->GetPath())); profile_->GetPath()));
} }
#endif // OS_WIN #endif // defined(OS_WIN)
#if defined(ENABLE_RLZ) && !defined(OS_CHROMEOS) #if defined(ENABLE_RLZ) && !defined(OS_CHROMEOS)
// Init the RLZ library. This just binds the dll and schedules a task on the // Init the RLZ library. This just binds the dll and schedules a task on the
...@@ -1446,7 +1456,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ...@@ -1446,7 +1456,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
parsed_command_line().GetSwitchValuePath(switches::kDebugPrint); parsed_command_line().GetSwitchValuePath(switches::kDebugPrint);
printing::PrintedDocument::set_debug_dump_path(path); printing::PrintedDocument::set_debug_dump_path(path);
} }
#endif #endif // defined(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD)
HandleTestParameters(parsed_command_line()); HandleTestParameters(parsed_command_line());
browser_process_->metrics_service()->RecordBreakpadHasDebugger( browser_process_->metrics_service()->RecordBreakpadHasDebugger(
...@@ -1471,7 +1481,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ...@@ -1471,7 +1481,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
// Start watching for a hang. // Start watching for a hang.
browser_process_->metrics_service()->LogNeedForCleanShutdown(); browser_process_->metrics_service()->LogNeedForCleanShutdown();
#endif #endif // !defined(OS_ANDROID)
#if defined(ENABLE_PRINT_PREVIEW) #if defined(ENABLE_PRINT_PREVIEW)
// Create the instance of the cloud print proxy service so that it can launch // Create the instance of the cloud print proxy service so that it can launch
...@@ -1481,7 +1491,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ...@@ -1481,7 +1491,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
// BrowserContextKeyedServiceFactory::ServiceIsCreatedWithBrowserContext() // BrowserContextKeyedServiceFactory::ServiceIsCreatedWithBrowserContext()
// instead? // instead?
CloudPrintProxyServiceFactory::GetForProfile(profile_); CloudPrintProxyServiceFactory::GetForProfile(profile_);
#endif #endif // defined(ENABLE_PRINT_PREVIEW)
// Start watching all browser threads for responsiveness. // Start watching all browser threads for responsiveness.
metrics::MetricsService::SetExecutionPhase( metrics::MetricsService::SetExecutionPhase(
...@@ -1491,14 +1501,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ...@@ -1491,14 +1501,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
ThreadWatcherAndroid::RegisterApplicationStatusListener(); ThreadWatcherAndroid::RegisterApplicationStatusListener();
#endif #endif // defined(OS_ANDROID)
#if !defined(DISABLE_NACL) #if !defined(DISABLE_NACL)
BrowserThread::PostTask( BrowserThread::PostTask(
BrowserThread::IO, BrowserThread::IO,
FROM_HERE, FROM_HERE,
base::Bind(nacl::NaClProcessHost::EarlyStartup)); base::Bind(nacl::NaClProcessHost::EarlyStartup));
#endif #endif // !defined(DISABLE_NACL)
// Make sure initial prefs are recorded // Make sure initial prefs are recorded
PrefMetricsService::Factory::GetForProfile(profile_); PrefMetricsService::Factory::GetForProfile(profile_);
...@@ -1544,17 +1554,24 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ...@@ -1544,17 +1554,24 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
#else #else
std::vector<Profile*> last_opened_profiles = std::vector<Profile*> last_opened_profiles =
g_browser_process->profile_manager()->GetLastOpenedProfiles(); g_browser_process->profile_manager()->GetLastOpenedProfiles();
#endif #endif // defined(OS_CHROMEOS)
UMA_HISTOGRAM_TIMES("Startup.PreMainMessageLoopRunImplStep2Time",
base::TimeTicks::Now() - start_time_step2);
if (browser_creator_->Start(parsed_command_line(), base::FilePath(), // This step is costly and is already measured in
profile_, last_opened_profiles)) { // Startup.StartupBrowserCreator_Start.
bool started = browser_creator_->Start(
parsed_command_line(), base::FilePath(), profile_, last_opened_profiles);
const base::TimeTicks start_time_step3 = base::TimeTicks::Now();
if (started) {
#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
// Initialize autoupdate timer. Timer callback costs basically nothing // Initialize autoupdate timer. Timer callback costs basically nothing
// when browser is not in persistent mode, so it's OK to let it ride on // when browser is not in persistent mode, so it's OK to let it ride on
// the main thread. This needs to be done here because we don't want // the main thread. This needs to be done here because we don't want
// to start the timer when Chrome is run inside a test harness. // to start the timer when Chrome is run inside a test harness.
browser_process_->StartAutoupdateTimer(); browser_process_->StartAutoupdateTimer();
#endif #endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
#if defined(OS_LINUX) && !defined(OS_CHROMEOS) #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
// On Linux, the running exe will be updated if an upgrade becomes // On Linux, the running exe will be updated if an upgrade becomes
...@@ -1562,7 +1579,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ...@@ -1562,7 +1579,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
// modified time of the exe, so we can compare to determine if there is // modified time of the exe, so we can compare to determine if there is
// an upgrade while the browser is kept alive by a persistent extension. // an upgrade while the browser is kept alive by a persistent extension.
upgrade_util::SaveLastModifiedTimeOfExe(); upgrade_util::SaveLastModifiedTimeOfExe();
#endif #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
// Record now as the last successful chrome start. // Record now as the last successful chrome start.
GoogleUpdateSettings::SetLastRunTime(); GoogleUpdateSettings::SetLastRunTime();
...@@ -1572,7 +1589,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ...@@ -1572,7 +1589,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
// because Start() will add things to it while creating the main window. // because Start() will add things to it while creating the main window.
if (parameters().autorelease_pool) if (parameters().autorelease_pool)
parameters().autorelease_pool->Recycle(); parameters().autorelease_pool->Recycle();
#endif #endif // defined(OS_MACOSX)
base::TimeDelta delay = base::TimeTicks::Now() - browser_open_start; base::TimeDelta delay = base::TimeTicks::Now() - browser_open_start;
UMA_HISTOGRAM_LONG_TIMES_100("Startup.BrowserOpenTabs", delay); UMA_HISTOGRAM_LONG_TIMES_100("Startup.BrowserOpenTabs", delay);
...@@ -1589,7 +1606,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ...@@ -1589,7 +1606,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
#if defined(OS_WIN) #if defined(OS_WIN)
variations_service->StartGoogleUpdateRegistrySync(); variations_service->StartGoogleUpdateRegistrySync();
#endif #endif // defined(OS_WIN)
} }
translate::TranslateDownloadManager::RequestLanguageList( translate::TranslateDownloadManager::RequestLanguageList(
...@@ -1605,7 +1622,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ...@@ -1605,7 +1622,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
#if !defined(OS_LINUX) || defined(OS_CHROMEOS) // http://crbug.com/426393 #if !defined(OS_LINUX) || defined(OS_CHROMEOS) // http://crbug.com/426393
if (g_browser_process->metrics_service()->reporting_active()) if (g_browser_process->metrics_service()->reporting_active())
content::StartPowerUsageMonitor(); content::StartPowerUsageMonitor();
#endif #endif // !defined(OS_LINUX) || defined(OS_CHROMEOS)
process_power_collector_.reset(new ProcessPowerCollector); process_power_collector_.reset(new ProcessPowerCollector);
process_power_collector_->Initialize(); process_power_collector_->Initialize();
...@@ -1621,11 +1638,17 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ...@@ -1621,11 +1638,17 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
// We never run the C++ main loop on Android, since the UI thread message // We never run the C++ main loop on Android, since the UI thread message
// loop is controlled by the OS, so this is as close as we can get to // loop is controlled by the OS, so this is as close as we can get to
// the start of the main loop // the start of the main loop.
if (result_code_ <= 0) { if (result_code_ <= 0) {
RecordBrowserStartupTime(); RecordBrowserStartupTime();
} }
#endif #endif // defined(OS_ANDROID)
#if !defined(OS_ANDROID)
UMA_HISTOGRAM_TIMES("Startup.PreMainMessageLoopRunImplStep3Time",
base::TimeTicks::Now() - start_time_step3);
#endif // !defined(OS_ANDROID)
return result_code_; return result_code_;
} }
...@@ -1658,7 +1681,7 @@ bool ChromeBrowserMainParts::MainMessageLoopRun(int* result_code) { ...@@ -1658,7 +1681,7 @@ bool ChromeBrowserMainParts::MainMessageLoopRun(int* result_code) {
run_loop.Run(); run_loop.Run();
return true; return true;
#endif #endif // defined(OS_ANDROID)
} }
void ChromeBrowserMainParts::PostMainMessageLoopRun() { void ChromeBrowserMainParts::PostMainMessageLoopRun() {
...@@ -1701,7 +1724,7 @@ void ChromeBrowserMainParts::PostMainMessageLoopRun() { ...@@ -1701,7 +1724,7 @@ void ChromeBrowserMainParts::PostMainMessageLoopRun() {
restart_last_session_ = browser_shutdown::ShutdownPreThreadsStop(); restart_last_session_ = browser_shutdown::ShutdownPreThreadsStop();
browser_process_->StartTearDown(); browser_process_->StartTearDown();
#endif #endif // defined(OS_ANDROID)
} }
void ChromeBrowserMainParts::PostDestroyThreads() { void ChromeBrowserMainParts::PostDestroyThreads() {
...@@ -1728,8 +1751,8 @@ void ChromeBrowserMainParts::PostDestroyThreads() { ...@@ -1728,8 +1751,8 @@ void ChromeBrowserMainParts::PostDestroyThreads() {
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
chromeos::CrosSettings::Shutdown(); chromeos::CrosSettings::Shutdown();
#endif #endif // defined(OS_CHROMEOS)
#endif #endif // defined(OS_ANDROID)
} }
// Public members: // Public members:
......
tools/metrics/histograms/histograms.xml
View file @ 9c7eb447
...@@ -37726,6 +37726,33 @@ Therefore, the affected-histogram name has to have at least one dot in it. ...@@ -37726,6 +37726,33 @@ Therefore, the affected-histogram name has to have at least one dot in it.
</summary> </summary>
</histogram> </histogram>
<histogram name="Startup.PreMainMessageLoopRunImplStep1Time"
units="milliseconds">
<owner>rkaplow@chromium.org</owner>
<summary>
The amount of time that elapsed during the first untracked section of
ChromeBrowserMainParts::PreMainMessageLoopRunImpl.
</summary>
</histogram>
<histogram name="Startup.PreMainMessageLoopRunImplStep2Time"
units="milliseconds">
<owner>rkaplow@chromium.org</owner>
<summary>
The amount of time that elapsed during the second untracked section of
ChromeBrowserMainParts::PreMainMessageLoopRunImpl. Not written for Android.
</summary>
</histogram>
<histogram name="Startup.PreMainMessageLoopRunImplStep3Time"
units="milliseconds">
<owner>rkaplow@chromium.org</owner>
<summary>
The amount of time that elapsed during the third untracked section of
ChromeBrowserMainParts::PreMainMessageLoopRunImpl. Not written for Android.
</summary>
</histogram>
<histogram name="Startup.PreMainMessageLoopRunImplTime" units="milliseconds"> <histogram name="Startup.PreMainMessageLoopRunImplTime" units="milliseconds">
<obsolete> <obsolete>
Deprecated as of 2/2015. Deprecated as of 2/2015.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment