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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 1945803002: SyzyASAN: Export experiment state to finch synthetic field trials. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix export name to match the SyzyASAN-side name change. Created 4 years, 7 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 | chrome/browser/metrics/chrome_metrics_service_accessor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index fe298463c97f143300c8abd98da235f4be79f648..188ccb38ada706c5d06d78d5d3fd44d23212cebf 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1224,33 +1224,70 @@ void ChromeBrowserMainParts::PostProfileInit() {
chrome_extra_parts_[i]->PostProfileInit();
}
-void ChromeBrowserMainParts::PreBrowserStart() {
- TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreBrowserStart");
- for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
- chrome_extra_parts_[i]->PreBrowserStart();
+#if defined(SYZYASAN)
- three_d_observer_.reset(new ThreeDAPIObserver());
+// This function must be in the global namespace as it needs to be friended
+// by ChromeMetricsServiceAccessor.
+void SyzyASANRegisterExperiment(const char* name, const char* group) {
+ ChromeMetricsServiceAccessor::RegisterSyntheticFieldTrial(name, group);
+}
+
+namespace {
+
+void WINAPI SyzyASANExperimentCallback(const char* name, const char* group) {
+ // Indirect through the function above, so that the friend declaration doesn't
+ // need the ugly calling convention.
+ SyzyASANRegisterExperiment(name, group);
+}
+
+void SetupSyzyASAN() {
+ typedef VOID(WINAPI* SyzyASANExperimentCallbackFn)(const char* name,
+ const char* group);
+ typedef VOID(WINAPI* SyzyASANEnumExperimentsFn)(SyzyASANExperimentCallbackFn);
+ HMODULE syzyasan_handle = ::GetModuleHandle(L"syzyasan_rtl.dll");
+ if (!syzyasan_handle)
+ return;
+
+ // Export the SyzyASAN experiments as synthetic field trials.
+ SyzyASANEnumExperimentsFn syzyasan_enum_experiments =
+ reinterpret_cast<SyzyASANEnumExperimentsFn>(
+ ::GetProcAddress(syzyasan_handle, "asan_EnumExperiments"));
+ if (syzyasan_enum_experiments) {
+ syzyasan_enum_experiments(&SyzyASANExperimentCallback);
+ }
-#if defined(SYZYASAN)
// Enable the deferred free mechanism in the syzyasan module, which helps the
// performance by deferring some work on the critical path to a background
// thread.
if (base::FeatureList::IsEnabled(features::kSyzyasanDeferredFree)) {
typedef VOID(WINAPI * SyzyasanEnableDeferredFreeThreadFunc)(VOID);
- HMODULE syzyasan_handle = ::GetModuleHandle(L"syzyasan_rtl.dll");
bool success = false;
- if (syzyasan_handle) {
- SyzyasanEnableDeferredFreeThreadFunc syzyasan_enable_deferred_free =
- reinterpret_cast<SyzyasanEnableDeferredFreeThreadFunc>(
- ::GetProcAddress(syzyasan_handle,
- "asan_EnableDeferredFreeThread"));
- if (syzyasan_enable_deferred_free) {
- syzyasan_enable_deferred_free();
- success = true;
- }
+ SyzyasanEnableDeferredFreeThreadFunc syzyasan_enable_deferred_free =
+ reinterpret_cast<SyzyasanEnableDeferredFreeThreadFunc>(
+ ::GetProcAddress(syzyasan_handle,
+ "asan_EnableDeferredFreeThread"));
+ if (syzyasan_enable_deferred_free) {
+ syzyasan_enable_deferred_free();
+ success = true;
}
UMA_HISTOGRAM_BOOLEAN("Syzyasan.DeferredFreeWasEnabled", success);
}
+}
+
+} // namespace
+
+#endif // SYZYASAN
+
+
+void ChromeBrowserMainParts::PreBrowserStart() {
+ TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreBrowserStart");
+ for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
+ chrome_extra_parts_[i]->PreBrowserStart();
+
+ three_d_observer_.reset(new ThreeDAPIObserver());
+
+#if defined(SYZYASAN)
+ SetupSyzyASAN();
#endif
// Start the tab manager here so that we give the most amount of time for the
« no previous file with comments | « no previous file | chrome/browser/metrics/chrome_metrics_service_accessor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698