diff options
Diffstat (limited to 'components/startup_metric_utils/browser')
7 files changed, 159 insertions, 16 deletions
diff --git a/components/startup_metric_utils/browser/BUILD.gn b/components/startup_metric_utils/browser/BUILD.gn index 258e210..8f44817 100644 --- a/components/startup_metric_utils/browser/BUILD.gn +++ b/components/startup_metric_utils/browser/BUILD.gn @@ -2,7 +2,20 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -source_set("browser") { +# We have 2 separate targets because //components/html_viewer requires :lib, +# but has symbols that conflict with mojo symbols that :message_filter_lib +# indirectly depends on. + +group("browser") { + testonly = true + + deps = [ + ":lib", + ":message_filter_lib", + ] +} + +source_set("lib") { sources = [ "startup_metric_utils.cc", "startup_metric_utils.h", @@ -12,3 +25,17 @@ source_set("browser") { "//base", ] } + +source_set("message_filter_lib") { + sources = [ + "startup_metric_message_filter.cc", + "startup_metric_message_filter.h", + ] + + deps = [ + ":lib", + "//base", + "//components/startup_metric_utils/common", + "//content/public/browser", + ] +} diff --git a/components/startup_metric_utils/browser/DEPS b/components/startup_metric_utils/browser/DEPS new file mode 100644 index 0000000..1c35d9c --- /dev/null +++ b/components/startup_metric_utils/browser/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+content/public/browser", +] diff --git a/components/startup_metric_utils/browser/OWNERS b/components/startup_metric_utils/browser/OWNERS new file mode 100644 index 0000000..ba38e27 --- /dev/null +++ b/components/startup_metric_utils/browser/OWNERS @@ -0,0 +1,13 @@ +# Changes to IPC messages require a security review to avoid introducing +# new sandbox escapes. +per-file *_message*.h=set noparent +per-file *_message*.h=dcheng@chromium.org +per-file *_message*.h=inferno@chromium.org +per-file *_message*.h=jln@chromium.org +per-file *_message*.h=jschuh@chromium.org +per-file *_message*.h=kenrb@chromium.org +per-file *_message*.h=mkwst@chromium.org +per-file *_message*.h=nasko@chromium.org +per-file *_message*.h=palmer@chromium.org +per-file *_message*.h=tsepez@chromium.org +per-file *_message*.h=wfh@chromium.org diff --git a/components/startup_metric_utils/browser/startup_metric_message_filter.cc b/components/startup_metric_utils/browser/startup_metric_message_filter.cc new file mode 100644 index 0000000..556d045 --- /dev/null +++ b/components/startup_metric_utils/browser/startup_metric_message_filter.cc @@ -0,0 +1,31 @@ +// Copyright 2015 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "components/startup_metric_utils/browser/startup_metric_message_filter.h" + +#include "components/startup_metric_utils/browser/startup_metric_utils.h" +#include "components/startup_metric_utils/common/startup_metric_messages.h" + +namespace startup_metric_utils { + +StartupMetricMessageFilter::StartupMetricMessageFilter() + : content::BrowserMessageFilter(StartupMetricMsgStart) {} + +bool StartupMetricMessageFilter::OnMessageReceived( + const IPC::Message& message) { + bool handled = true; + IPC_BEGIN_MESSAGE_MAP(StartupMetricMessageFilter, message) + IPC_MESSAGE_HANDLER(StartupMetricHostMsg_RecordRendererMainEntryTime, + OnRecordRendererMainEntryTime) + IPC_MESSAGE_UNHANDLED(handled = false) + IPC_END_MESSAGE_MAP() + return handled; +} + +void StartupMetricMessageFilter::OnRecordRendererMainEntryTime( + const base::TimeTicks& renderer_main_entry_time) { + RecordRendererMainEntryTime(renderer_main_entry_time); +} + +} // namespace startup_metric_utils diff --git a/components/startup_metric_utils/browser/startup_metric_message_filter.h b/components/startup_metric_utils/browser/startup_metric_message_filter.h new file mode 100644 index 0000000..ffac9c8 --- /dev/null +++ b/components/startup_metric_utils/browser/startup_metric_message_filter.h @@ -0,0 +1,31 @@ +// Copyright 2015 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef COMPONENTS_STARTUP_METRIC_UTILS_BROWSER_STARTUP_METRIC_MESSAGE_FILTER_H_ +#define COMPONENTS_STARTUP_METRIC_UTILS_BROWSER_STARTUP_METRIC_MESSAGE_FILTER_H_ + +#include <stdint.h> + +#include "base/macros.h" +#include "base/time/time.h" +#include "content/public/browser/browser_message_filter.h" + +namespace startup_metric_utils { + +class StartupMetricMessageFilter : public content::BrowserMessageFilter { + public: + StartupMetricMessageFilter(); + bool OnMessageReceived(const IPC::Message& message) override; + + private: + ~StartupMetricMessageFilter() override = default; + void OnRecordRendererMainEntryTime( + const base::TimeTicks& renderer_main_entry_time); + + DISALLOW_COPY_AND_ASSIGN(StartupMetricMessageFilter); +}; + +} // namespace startup_metric_utils + +#endif // COMPONENTS_STARTUP_METRIC_UTILS_BROWSER_STARTUP_METRIC_MESSAGE_FILTER_H_ diff --git a/components/startup_metric_utils/browser/startup_metric_utils.cc b/components/startup_metric_utils/browser/startup_metric_utils.cc index 3f41447..626079e 100644 --- a/components/startup_metric_utils/browser/startup_metric_utils.cc +++ b/components/startup_metric_utils/browser/startup_metric_utils.cc @@ -30,13 +30,16 @@ volatile bool g_non_browser_ui_displayed = false; base::LazyInstance<base::TimeTicks>::Leaky g_process_creation_ticks = LAZY_INSTANCE_INITIALIZER; -base::LazyInstance<base::TimeTicks>::Leaky g_main_entry_point_ticks = +base::LazyInstance<base::TimeTicks>::Leaky g_browser_main_entry_point_ticks = + LAZY_INSTANCE_INITIALIZER; + +base::LazyInstance<base::TimeTicks>::Leaky g_renderer_main_entry_point_ticks = LAZY_INSTANCE_INITIALIZER; // Only used by RecordMainEntryTimeHistogram(), should go away with it (do not // add new uses of this), see crbug.com/317481 for discussion on why it was kept // as-is for now. -base::LazyInstance<base::Time>::Leaky g_main_entry_point_time = +base::LazyInstance<base::Time>::Leaky g_browser_main_entry_point_time = LAZY_INSTANCE_INITIALIZER; StartupTemperature g_startup_temperature = UNCERTAIN_STARTUP_TEMPERATURE; @@ -170,6 +173,8 @@ bool GetHardFaultCountForCurrentProcess(uint32_t* hard_fault_count, // ".ColdStart" or ".WarmStart", as appropriate. // |value_expr| is an expression evaluating to the value to be recorded. This // will be evaluated exactly once and cached, so side effects are not an issue. +// A metric logged using this macro must have an affected-histogram entry in the +// definition of the StartupTemperature suffix in histograms.xml. #define UMA_HISTOGRAM_WITH_STARTUP_TEMPERATURE(type, basename, value_expr) \ { \ const auto kValue = value_expr; \ @@ -298,9 +303,9 @@ base::TimeTicks StartupTimeToTimeTicks(const base::Time& time) { void RecordMainEntryTimeHistogram() { const int kLowWordMask = 0xFFFFFFFF; const int kLower31BitsMask = 0x7FFFFFFF; - DCHECK(!g_main_entry_point_time.Get().is_null()); + DCHECK(!g_browser_main_entry_point_time.Get().is_null()); const base::TimeDelta browser_main_entry_time_absolute = - g_main_entry_point_time.Get() - base::Time::UnixEpoch(); + g_browser_main_entry_point_time.Get() - base::Time::UnixEpoch(); const uint64 browser_main_entry_time_raw_ms = browser_main_entry_time_absolute.InMilliseconds(); @@ -320,6 +325,21 @@ void RecordMainEntryTimeHistogram() { browser_main_entry_time_raw_ms_low_word); } +// Record renderer main entry time histogram. +void RecordRendererMainEntryHistogram() { + const base::TimeTicks& browser_main_entry_point_ticks = + g_browser_main_entry_point_ticks.Get(); + const base::TimeTicks& renderer_main_entry_point_ticks = + g_renderer_main_entry_point_ticks.Get(); + + if (!browser_main_entry_point_ticks.is_null() && + !renderer_main_entry_point_ticks.is_null()) { + UMA_HISTOGRAM_AND_TRACE_WITH_STARTUP_TEMPERATURE( + UMA_HISTOGRAM_LONG_TIMES_100, "Startup.BrowserMainToRendererMain", + browser_main_entry_point_ticks, renderer_main_entry_point_ticks); + } +} + // Environment variable that stores the timestamp when the executable's main() // function was entered in TimeTicks. This is required because chrome.exe and // chrome.dll don't share the same static storage. @@ -354,15 +374,15 @@ void RecordStartupProcessCreationTime(const base::Time& time) { } void RecordMainEntryPointTime(const base::Time& time) { - DCHECK(g_main_entry_point_ticks.Get().is_null()); - g_main_entry_point_ticks.Get() = StartupTimeToTimeTicks(time); - DCHECK(!g_main_entry_point_ticks.Get().is_null()); + DCHECK(g_browser_main_entry_point_ticks.Get().is_null()); + g_browser_main_entry_point_ticks.Get() = StartupTimeToTimeTicks(time); + DCHECK(!g_browser_main_entry_point_ticks.Get().is_null()); // TODO(jeremy): Remove this with RecordMainEntryTimeHistogram() when // resolving crbug.com/317481. - DCHECK(g_main_entry_point_time.Get().is_null()); - g_main_entry_point_time.Get() = time; - DCHECK(!g_main_entry_point_time.Get().is_null()); + DCHECK(g_browser_main_entry_point_time.Get().is_null()); + g_browser_main_entry_point_time.Get() = time; + DCHECK(!g_browser_main_entry_point_time.Get().is_null()); } void RecordExeMainEntryPointTime(const base::Time& time) { @@ -400,12 +420,12 @@ void RecordBrowserMainMessageLoopStart(const base::TimeTicks& ticks, UMA_HISTOGRAM_AND_TRACE_WITH_STARTUP_TEMPERATURE( UMA_HISTOGRAM_LONG_TIMES, "Startup.BrowserMessageLoopStartTimeFromMainEntry.FirstRun", - g_main_entry_point_ticks.Get(), ticks); + g_browser_main_entry_point_ticks.Get(), ticks); } else { UMA_HISTOGRAM_AND_TRACE_WITH_STARTUP_TEMPERATURE( UMA_HISTOGRAM_LONG_TIMES, "Startup.BrowserMessageLoopStartTimeFromMainEntry", - g_main_entry_point_ticks.Get(), ticks); + g_browser_main_entry_point_ticks.Get(), ticks); } // Record timings between process creation, the main() in the executable being @@ -421,13 +441,13 @@ void RecordBrowserMainMessageLoopStart(const base::TimeTicks& ticks, // chrome.exe:main() to chrome.dll:main(). UMA_HISTOGRAM_AND_TRACE_WITH_STARTUP_TEMPERATURE( UMA_HISTOGRAM_LONG_TIMES, "Startup.LoadTime.ExeMainToDllMain", - exe_main_ticks, g_main_entry_point_ticks.Get()); + exe_main_ticks, g_browser_main_entry_point_ticks.Get()); // Process create to chrome.dll:main(). Reported as a histogram only as // the other two events above are sufficient for tracing purposes. UMA_HISTOGRAM_WITH_STARTUP_TEMPERATURE( UMA_HISTOGRAM_LONG_TIMES, "Startup.LoadTime.ProcessCreateToDllMain", - g_main_entry_point_ticks.Get() - process_creation_ticks); + g_browser_main_entry_point_ticks.Get() - process_creation_ticks); } } } @@ -455,6 +475,13 @@ void RecordBrowserOpenTabsDelta(const base::TimeDelta& delta) { "Startup.BrowserOpenTabs", delta); } +void RecordRendererMainEntryTime(const base::TimeTicks& ticks) { + // Record the renderer main entry time, but don't log the UMA metric + // immediately because the startup temperature is not known yet. + if (g_renderer_main_entry_point_ticks.Get().is_null()) + g_renderer_main_entry_point_ticks.Get() = ticks; +} + void RecordFirstWebContentsMainFrameLoad(const base::TimeTicks& ticks) { static bool is_first_call = true; if (!is_first_call || ticks.is_null()) @@ -487,6 +514,11 @@ void RecordFirstWebContentsNonEmptyPaint(const base::TimeTicks& ticks) { if (!is_first_call || ticks.is_null()) return; is_first_call = false; + + // Log Startup.BrowserMainToRendererMain now that the first renderer main + // entry time and the startup temperature are known. + RecordRendererMainEntryHistogram(); + if (WasNonBrowserUIDisplayed() || g_process_creation_ticks.Get().is_null()) return; @@ -539,7 +571,7 @@ void RecordFirstWebContentsMainNavigationFinished( } base::TimeTicks MainEntryPointTicks() { - return g_main_entry_point_ticks.Get(); + return g_browser_main_entry_point_ticks.Get(); } StartupTemperature GetStartupTemperature() { diff --git a/components/startup_metric_utils/browser/startup_metric_utils.h b/components/startup_metric_utils/browser/startup_metric_utils.h index 2b2885f..0422f4f 100644 --- a/components/startup_metric_utils/browser/startup_metric_utils.h +++ b/components/startup_metric_utils/browser/startup_metric_utils.h @@ -72,6 +72,12 @@ void RecordBrowserWindowDisplay(const base::TimeTicks& ticks); // Call this with the time delta that the browser spent opening its tabs. void RecordBrowserOpenTabsDelta(const base::TimeDelta& delta); +// Call this with a renderer main entry time. The value provided for the first +// call to this function is used to compute +// Startup.LoadTime.BrowserMainToRendererMain. Further calls to this +// function are ignored. +void RecordRendererMainEntryTime(const base::TimeTicks& ticks); + // Call this with the time when the first web contents loaded its main frame, // only if the first web contents was unimpended in its attempt to do so. void RecordFirstWebContentsMainFrameLoad(const base::TimeTicks& ticks); |