Merge "simpleperf: add new options accepted by simpleperf_app_runner." am: 3a7d01f6c1 am: ba61ff1971

Change-Id: I360e6678639437670e12545461626115bbefbbcc

1 files changed, 43 insertions, 8 deletions

diff --git a/simpleperf/simpleperf_app_runner/simpleperf_app_runner.cpp b/simpleperf/simpleperf_app_runner/simpleperf_app_runner.cpp
index 9aec41f0..d7cf3562 100644
--- a/simpleperf/simpleperf_app_runner/simpleperf_app_runner.cpp
+++ b/simpleperf/simpleperf_app_runner/simpleperf_app_runner.cpp
@@ -103,23 +103,58 @@ static void CheckSimpleperfArguments(const char* cmdname, char** args) {
     error(1, 0, "cmd isn't allowed: %s", cmdname);
   }
   std::set<std::string> zero_arg_options = {
-      "-b", "--csv", "--exit-with-parent", "-g", "--in-app", "--interval-only-values",
+      "-b",
+      "--csv",
+      "--exclude-perf",
+      "--exit-with-parent",
+      "-g",
+      "--in-app",
+      "--interval-only-values",
       "--log-to-android-buffer",
-      "--no-callchain-joiner", "--no-dump-kernel-symbols", "--no-dump-symbols", "--no-inherit",
-      "--post-unwind=no", "--post-unwind=yes", "--trace-offcpu", "--verbose",
+      "--no-callchain-joiner",
+      "--no-cut-samples",
+      "--no-dump-kernel-symbols",
+      "--no-dump-symbols",
+      "--no-inherit",
+      "--no-unwind",
+      "--per-core",
+      "--per-thread",
+      "--post-unwind=no",
+      "--post-unwind=yes",
+      "--trace-offcpu",
+      "--verbose",
   };
   std::set<std::string> one_arg_options = {
-      "-c", "--call-graph", "--callchain-joiner-min-matching-nodes", "--clockid", "--cpu",
-      "--cpu-percent", "--duration", "-e", "-f", "--group", "--interval", "-j", "--log", "-m",
-      "-p", "--size-limit", "-t",
+      "--aux-buffer-size",
+      "-c",
+      "--call-graph",
+      "--callchain-joiner-min-matching-nodes",
+      "--clockid",
+      "--cpu",
+      "--cpu-percent",
+      "--duration",
+      "-e",
+      "-f",
+      "--group",
+      "--include-filter",
+      "--interval",
+      "-j",
+      "--log",
+      "-m",
+      "-p",
+      "--size-limit",
+      "-t",
   };
   // options with a file descriptor
   std::set<std::string> fd_options = {
-      "--start_profiling_fd", "--stop-signal-fd", "--out-fd",
+      "--start_profiling_fd",
+      "--stop-signal-fd",
+      "--out-fd",
   };
   // options with path from /data/local/tmp/
   std::set<std::string> path_options = {
-      "--symfs", "--tracepoint-events",
+      "--symfs",
+      "--tracepoint-events",
   };
   one_arg_options.insert(fd_options.begin(), fd_options.end());
   one_arg_options.insert(path_options.begin(), path_options.end());