Benchmark: `--save-all-traces` argument

apps/benchmark/benchmark_app.cc

 // 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 <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "apps/benchmark/event.h"
@@ skipping 26 matching lines @@
 
   // mojo:ApplicationDelegate:
   void Initialize(mojo::ApplicationImpl* app) override {
     // Parse command-line arguments.
     if (!GetRunArgs(app->args(), &args_)) {
       LOG(ERROR) << "Failed to parse the input arguments.";
       mojo::ApplicationImpl::Terminate();
       return;
     }
 
-    // Calculate a list of trace categories we want to collect: a union of all
-    // categories targeted in measurements.
-    std::set<std::string> category_set;
-    for (const Measurement& measurement : args_.measurements) {
-      std::vector<std::string> categories;
-      base::SplitString(measurement.target_event.categories, ',', &categories);
-      category_set.insert(categories.begin(), categories.end());
+    // Don't compute the categories string if all categories should be traced.
+    std::string categories_str = "*";
+    if (!args_.write_output_file) {

[ppi, 2015/10/29 16:02:09]

nit: it's a bit weird to set the initial value to a special case, and then flip
the value in the default case

Can you declare the variable without setting anything, and then to:

if (args_.write_output_file) {
  one thing
} else {
  another thing
}

?

Alternatively you can use the ternary operator.

[nelly, 2015/10/29 16:48:22]

Done.

+      categories_str = ComputeCategoriesStr();
     }
-    std::vector<std::string> unique_categories(category_set.begin(),
-                                               category_set.end());
-    std::string categories_str = JoinString(unique_categories, ',');
 
     // Connect to trace collector, which will fetch the trace events produced by
     // the app being benchmarked.
     tracing::TraceCollectorPtr trace_collector;
     app->ConnectToService("mojo:tracing", &trace_collector);
     trace_collector_client_.reset(
         new TraceCollectorClient(this, trace_collector.Pass()));
     trace_collector_client_->Start(categories_str);
 
     // Start tracing the application with 1 sec of delay.
     base::MessageLoop::current()->PostDelayedTask(
-        FROM_HERE,
-        base::Bind(&BenchmarkApp::StartTracedApplication,
-            base::Unretained(this), app),
-        base::TimeDelta::FromSeconds(1));
+        FROM_HERE, base::Bind(&BenchmarkApp::StartTracedApplication,
+                              base::Unretained(this), app),
+        base::TimeDelta::FromMilliseconds(1000));

[ppi, 2015/10/29 16:02:09]

Why the change from s to ms?

[nelly, 2015/10/29 16:48:22]

Done.

+  }
+
+  // Computes the string of trace categories we want to collect: a union of all
+  // categories targeted in measurements.
+  std::string ComputeCategoriesStr() {
+    std::set<std::string> category_set;
+    for (const Measurement& measurement : args_.measurements) {
+      std::vector<std::string> categories;
+      base::SplitString(measurement.target_event.categories, ',', &categories);
+      category_set.insert(categories.begin(), categories.end());
+    }
+    std::vector<std::string> unique_categories(category_set.begin(),
+                                               category_set.end());
+    return JoinString(unique_categories, ',');
   }
 
   void StartTracedApplication(mojo::ApplicationImpl* app) {
     // Record the time origin for measurements just before connecting to the app
     // being benchmarked.
     time_origin_ = base::TimeTicks::FromInternalValue(MojoGetTimeTicksNow());
     traced_app_connection_ = app->ConnectToApplication(args_.app);
 
     // Post task to stop tracing when the time is up.
     base::MessageLoop::current()->PostDelayedTask(
@@ skipping 63 matching lines @@
 };
 }  // namespace
 }  // namespace benchmark
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new benchmark::BenchmarkApp);
   auto ret = runner.Run(application_request);
   fflush(nullptr);
   return ret;
 }