[Startup Tracing] Hook up TraceConfig and remove CategoryFilter & TraceOptions

content/browser/tracing/tracing_controller_impl.cc

 // Copyright (c) 2013 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 "content/browser/tracing/tracing_controller_impl.h"
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/json/string_escape.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/tracing/file_tracing_provider_impl.h"
 #include "content/browser/tracing/trace_message_filter.h"
 #include "content/browser/tracing/tracing_ui.h"
 #include "content/common/child_process_messages.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/common/content_switches.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/debug_daemon_client.h"
 #endif
 
 #if defined(OS_WIN)
 #include "content/browser/tracing/etw_system_event_consumer_win.h"
 #endif
 
 using base::trace_event::TraceLog;
-using base::trace_event::TraceOptions;
-using base::trace_event::CategoryFilter;
+using base::trace_event::TraceConfig;
 
 namespace content {
 
 namespace {
 
 base::LazyInstance<TracingControllerImpl>::Leaky g_controller =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
@@ skipping 32 matching lines @@
 }
 
 bool TracingControllerImpl::GetCategories(
     const GetCategoriesDoneCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Known categories come back from child processes with the EndTracingAck
   // message. So to get known categories, just begin and end tracing immediately
   // afterwards. This will ping all the child processes for categories.
   pending_get_categories_done_callback_ = callback;
-  if (!EnableRecording(
-          CategoryFilter("*"), TraceOptions(), EnableRecordingDoneCallback())) {
+  if (!EnableRecording(TraceConfig("*", ""), EnableRecordingDoneCallback())) {
     pending_get_categories_done_callback_.Reset();
     return false;
   }
 
   bool ok = DisableRecording(NULL);
   DCHECK(ok);
   return true;
 }
 
 void TracingControllerImpl::SetEnabledOnFileThread(
-    const CategoryFilter& category_filter,
+    const TraceConfig& trace_config,
     int mode,
-    const TraceOptions& trace_options,
     const base::Closure& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   TraceLog::GetInstance()->SetEnabled(
-      category_filter, static_cast<TraceLog::Mode>(mode), trace_options);
+      trace_config, static_cast<TraceLog::Mode>(mode));
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
 }
 
 void TracingControllerImpl::SetDisabledOnFileThread(
     const base::Closure& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   TraceLog::GetInstance()->SetDisabled();
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
 }
 
 bool TracingControllerImpl::EnableRecording(
-    const CategoryFilter& category_filter,
-    const TraceOptions& trace_options,
+    const TraceConfig& trace_config,
     const EnableRecordingDoneCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!can_enable_recording())
     return false;
   is_recording_ = true;
 
 #if defined(OS_ANDROID)
   if (pending_get_categories_done_callback_.is_null())
     TraceLog::GetInstance()->AddClockSyncMetadataEvent();
 #endif
 
-  trace_options_ = trace_options;
-
-  if (trace_options.enable_systrace) {
+  if (trace_config.IsSystraceEnabled()) {
 #if defined(OS_CHROMEOS)
     DCHECK(!is_system_tracing_);
     chromeos::DBusThreadManager::Get()->GetDebugDaemonClient()->
       StartSystemTracing();
     is_system_tracing_ = true;
 #elif defined(OS_WIN)
     DCHECK(!is_system_tracing_);
     is_system_tracing_ =
         EtwSystemEventConsumer::GetInstance()->StartSystemTracing();
 #endif
   }
 
 
   base::Closure on_enable_recording_done_callback =
       base::Bind(&TracingControllerImpl::OnEnableRecordingDone,
                  base::Unretained(this),
-                 category_filter, trace_options, callback);
+                 trace_config, callback);
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&TracingControllerImpl::SetEnabledOnFileThread,
                  base::Unretained(this),
-                 category_filter,
+                 trace_config,
                  base::trace_event::TraceLog::RECORDING_MODE,
-                 trace_options,
                  on_enable_recording_done_callback));
   return true;
 }
 
 void TracingControllerImpl::OnEnableRecordingDone(
-    const CategoryFilter& category_filter,
-    const TraceOptions& trace_options,
+    const TraceConfig& trace_config,
     const EnableRecordingDoneCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Notify all child processes.
   for (TraceMessageFilterSet::iterator it = trace_message_filters_.begin();
       it != trace_message_filters_.end(); ++it) {
-    it->get()->SendBeginTracing(category_filter, trace_options);
+    it->get()->SendBeginTracing(trace_config);
   }
 
   if (!callback.is_null())
     callback.Run();
 }
 
 bool TracingControllerImpl::DisableRecording(
     const scoped_refptr<TraceDataSink>& trace_data_sink) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!can_disable_recording())
     return false;
 
   trace_data_sink_ = trace_data_sink;
-  trace_options_ = TraceOptions();
   // Disable local trace early to avoid traces during end-tracing process from
   // interfering with the process.
   base::Closure on_disable_recording_done_callback = base::Bind(
       &TracingControllerImpl::OnDisableRecordingDone, base::Unretained(this));
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&TracingControllerImpl::SetDisabledOnFileThread,
                  base::Unretained(this),
                  on_disable_recording_done_callback));
   return true;
 }
@@ skipping 46 matching lines @@
   }
 
   // Notify all child processes.
   for (TraceMessageFilterSet::iterator it = trace_message_filters_.begin();
       it != trace_message_filters_.end(); ++it) {
     it->get()->SendEndTracing();
   }
 }
 
 bool TracingControllerImpl::EnableMonitoring(
-    const CategoryFilter& category_filter,
-    const TraceOptions& trace_options,
+    const TraceConfig& trace_config,
     const EnableMonitoringDoneCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!can_enable_monitoring())
     return false;
   OnMonitoringStateChanged(true);
 
 #if defined(OS_ANDROID)
   TraceLog::GetInstance()->AddClockSyncMetadataEvent();
 #endif
 
-  trace_options_ = trace_options;
-
   base::Closure on_enable_monitoring_done_callback =
       base::Bind(&TracingControllerImpl::OnEnableMonitoringDone,
                  base::Unretained(this),
-                 category_filter, trace_options, callback);
+                 trace_config, callback);
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&TracingControllerImpl::SetEnabledOnFileThread,
                  base::Unretained(this),
-                 category_filter,
+                 trace_config,
                  base::trace_event::TraceLog::MONITORING_MODE,
-                 trace_options,
                  on_enable_monitoring_done_callback));
   return true;
 }
 
 void TracingControllerImpl::OnEnableMonitoringDone(
-    const CategoryFilter& category_filter,
-    const TraceOptions& trace_options,
+    const TraceConfig& trace_config,
     const EnableMonitoringDoneCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Notify all child processes.
   for (TraceMessageFilterSet::iterator it = trace_message_filters_.begin();
       it != trace_message_filters_.end(); ++it) {
-    it->get()->SendEnableMonitoring(category_filter, trace_options);
+    it->get()->SendEnableMonitoring(trace_config);
   }
 
   if (!callback.is_null())
     callback.Run();
 }
 
 bool TracingControllerImpl::DisableMonitoring(
     const DisableMonitoringDoneCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!can_disable_monitoring())
     return false;
 
-  trace_options_ = TraceOptions();
   base::Closure on_disable_monitoring_done_callback =
       base::Bind(&TracingControllerImpl::OnDisableMonitoringDone,
                  base::Unretained(this), callback);
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&TracingControllerImpl::SetDisabledOnFileThread,
                  base::Unretained(this),
                  on_disable_monitoring_done_callback));
   return true;
 }
 
 void TracingControllerImpl::OnDisableMonitoringDone(
     const DisableMonitoringDoneCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   OnMonitoringStateChanged(false);
 
   // Notify all child processes.
   for (TraceMessageFilterSet::iterator it = trace_message_filters_.begin();
       it != trace_message_filters_.end(); ++it) {
     it->get()->SendDisableMonitoring();
   }
   if (!callback.is_null())
     callback.Run();
 }
 
 void TracingControllerImpl::GetMonitoringStatus(
     bool* out_enabled,
-    CategoryFilter* out_category_filter,
-    TraceOptions* out_trace_options) {
+    TraceConfig* out_trace_config) {
   *out_enabled = is_monitoring_;
-  *out_category_filter = TraceLog::GetInstance()->GetCurrentCategoryFilter();
-  *out_trace_options = trace_options_;
+  *out_trace_config = TraceLog::GetInstance()->GetCurrentTraceConfig();
 }
 
 bool TracingControllerImpl::CaptureMonitoringSnapshot(
     const scoped_refptr<TraceDataSink>& monitoring_data_sink) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!can_disable_monitoring())
     return false;
 
   if (!monitoring_data_sink.get())
@@ skipping 114 matching lines @@
     return;
   }
 
   trace_message_filters_.insert(trace_message_filter);
   if (can_cancel_watch_event()) {
     trace_message_filter->SendSetWatchEvent(watch_category_name_,
                                             watch_event_name_);
   }
   if (can_disable_recording()) {
     trace_message_filter->SendBeginTracing(
-        TraceLog::GetInstance()->GetCurrentCategoryFilter(),
-        TraceLog::GetInstance()->GetCurrentTraceOptions());
+        TraceLog::GetInstance()->GetCurrentTraceConfig());
   }
   if (can_disable_monitoring()) {
     trace_message_filter->SendEnableMonitoring(
-        TraceLog::GetInstance()->GetCurrentCategoryFilter(),
-        TraceLog::GetInstance()->GetCurrentTraceOptions());
+        TraceLog::GetInstance()->GetCurrentTraceConfig());
   }
 }
 
 void TracingControllerImpl::RemoveTraceMessageFilter(
     TraceMessageFilter* trace_message_filter) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&TracingControllerImpl::RemoveTraceMessageFilter,
                    base::Unretained(this),
                    make_scoped_refptr(trace_message_filter)));
@@ skipping 388 matching lines @@
   is_monitoring_ = is_monitoring;
 #if !defined(OS_ANDROID)
   for (std::set<TracingUI*>::iterator it = tracing_uis_.begin();
        it != tracing_uis_.end(); it++) {
     (*it)->OnMonitoringStateChanged(is_monitoring);
   }
 #endif
 }
 
 }  // namespace content