diff options
Diffstat (limited to 'chromium/chrome/browser/ui/webui/chromeos/arc_graphics_tracing')
2 files changed, 13 insertions, 9 deletions
diff --git a/chromium/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc b/chromium/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc index 3c918789930..56515216033 100644 --- a/chromium/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc +++ b/chromium/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc @@ -404,9 +404,16 @@ void ArcGraphicsTracingHandler::StartTracing() { base::trace_event::TraceConfig config( "-*,exo,viz,toplevel,gpu,cc,blink,disabled-by-default-android " - "gfx,disabled-by-default-android hal,disabled-by-default-android view", + "gfx,disabled-by-default-android view", base::trace_event::RECORD_CONTINUOUSLY); config.EnableSystrace(); + // By default, systracing starts pre-defined set of categories with predefined + // set of events in each category. Limit events to what we actually analyze in + // ArcTracingModel. + config.EnableSystraceEvent("i915:intel_gpu_freq_change"); + config.EnableSystraceEvent("power:cpu_idle"); + config.EnableSystraceEvent("sched:sched_wakeup"); + config.EnableSystraceEvent("sched:sched_switch"); tracing_active_ = true; if (jank_detector_) jank_detector_->Reset(); @@ -434,8 +441,8 @@ void ArcGraphicsTracingHandler::StopTracing() { return; controller->StopTracing(content::TracingController::CreateStringEndpoint( - base::BindRepeating(&ArcGraphicsTracingHandler::OnTracingStopped, - weak_ptr_factory_.GetWeakPtr()))); + base::BindOnce(&ArcGraphicsTracingHandler::OnTracingStopped, + weak_ptr_factory_.GetWeakPtr()))); } void ArcGraphicsTracingHandler::SetStatus(const std::string& status) { @@ -452,10 +459,9 @@ void ArcGraphicsTracingHandler::OnTracingStarted() { } void ArcGraphicsTracingHandler::OnTracingStopped( - std::unique_ptr<const base::DictionaryValue> metadata, - base::RefCountedString* trace_data) { + std::unique_ptr<std::string> trace_data) { std::string string_data; - string_data.swap(trace_data->data()); + string_data.swap(*trace_data); base::PostTaskAndReplyWithResult( FROM_HERE, {base::ThreadPool(), base::MayBlock(), base::TaskPriority::BEST_EFFORT}, diff --git a/chromium/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.h b/chromium/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.h index bd774e39149..63849de5602 100644 --- a/chromium/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.h +++ b/chromium/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.h @@ -24,7 +24,6 @@ class ArcSystemStatCollector; namespace base { class ListValue; -class RefCountedString; } // namespace base namespace exo { @@ -71,8 +70,7 @@ class ArcGraphicsTracingHandler : public content::WebUIMessageHandler, void SetStatus(const std::string& status); void OnTracingStarted(); - void OnTracingStopped(std::unique_ptr<const base::DictionaryValue> metadata, - base::RefCountedString* trace_data); + void OnTracingStopped(std::unique_ptr<std::string> trace_data); // Called when graphics model is built or load. Extra string parameter // contains a status. In case model cannot be built/load empty |base::Value| |