perf script: Add option to stop printing callchain

author David Ahern <dsa@cumulusnetworks.com>

Fri, 25 Nov 2016 20:00:21 +0000 (13:00 -0700)

committer Arnaldo Carvalho de Melo <acme@redhat.com>

Tue, 29 Nov 2016 16:06:19 +0000 (13:06 -0300)
author David Ahern <dsa@cumulusnetworks.com>
Fri, 25 Nov 2016 20:00:21 +0000 (13:00 -0700)
committer Arnaldo Carvalho de Melo <acme@redhat.com>
Tue, 29 Nov 2016 16:06:19 +0000 (13:06 -0300)
diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt

index c01904f388ce807cb4acefc607df9314a56fcbb4..0f6ee09f7256fee04f3dcc1cda92599e62b7250f 100644 (file)
--- a/tools/perf/Documentation/perf-script.txt
+++ b/tools/perf/Documentation/perf-script.txt
@@ -212,6 +212,9 @@ OPTIONS
  --hide-call-graph::
          When printing symbols do not display call chain.
  
+--stop-bt::
+        Stop display of callgraph at these symbols
+
  -C::
  --cpu:: Only report samples for the list of CPUs provided. Multiple CPUs can
         be provided as a comma-separated list with no space: 0,1. Ranges of
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c

index e1daff36d0702920038e9685c47e881d6b7195db..066b4bf73780c96292a0c9a7aeefb41ed10dc95f 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -2151,6 +2151,8 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused)
                     "system-wide collection from all CPUs"),
         OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",
                    "only consider these symbols"),
+       OPT_STRING(0, "stop-bt", &symbol_conf.bt_stop_list_str, "symbol[,symbol...]",
+                  "Stop display of callgraph at these symbols"),
         OPT_STRING('C', "cpu", &cpu_list, "cpu", "list of cpus to profile"),
         OPT_STRING('c', "comms", &symbol_conf.comm_list_str, "comm[,comm...]",
                    "only display events for these comms"),
diff --git a/tools/perf/util/evsel_fprintf.c b/tools/perf/util/evsel_fprintf.c

index 5a6f52284452e2ea07be12f5eff85ea306356470..6b2925542c0a641d92ca15db702a43fbe15946c4 100644 (file)
--- a/tools/perf/util/evsel_fprintf.c
+++ b/tools/perf/util/evsel_fprintf.c
@@ -166,6 +166,14 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,
                         if (!print_oneline)
                                 printed += fprintf(fp, "\n");
  
+                       if (symbol_conf.bt_stop_list &&
+                           node->sym &&
+                           node->sym->name &&
+                           strlist__has_entry(symbol_conf.bt_stop_list,
+                                              node->sym->name)) {
+                               break;
+                       }
+
                         first = false;
  next:
                         callchain_cursor_advance(cursor);
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c

index 420ada9de22fa3464fcac7954762151f46112694..df2482b2ba45c47883a254db2ff4d6551aeea83b 100644 (file)
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -2032,6 +2032,10 @@ int symbol__init(struct perf_env *env)
                        symbol_conf.sym_list_str, "symbol") < 0)
                 goto out_free_tid_list;
  
+       if (setup_list(&symbol_conf.bt_stop_list,
+                      symbol_conf.bt_stop_list_str, "symbol") < 0)
+               goto out_free_sym_list;
+
         /*
          * A path to symbols of "/" is identical to ""
          * reset here for simplicity.
@@ -2049,6 +2053,8 @@ int symbol__init(struct perf_env *env)
         symbol_conf.initialized = true;
         return 0;
  
+out_free_sym_list:
+       strlist__delete(symbol_conf.sym_list);
  out_free_tid_list:
         intlist__delete(symbol_conf.tid_list);
  out_free_pid_list:
@@ -2064,6 +2070,7 @@ void symbol__exit(void)
  {
         if (!symbol_conf.initialized)
                 return;
+       strlist__delete(symbol_conf.bt_stop_list);
         strlist__delete(symbol_conf.sym_list);
         strlist__delete(symbol_conf.dso_list);
         strlist__delete(symbol_conf.comm_list);
@@ -2071,6 +2078,7 @@ void symbol__exit(void)
         intlist__delete(symbol_conf.pid_list);
         vmlinux_path__exit();
         symbol_conf.sym_list = symbol_conf.dso_list = symbol_conf.comm_list = NULL;
+       symbol_conf.bt_stop_list = NULL;
         symbol_conf.initialized = false;
  }
  
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h

index 1bcbefc0c325d327213e1368f453e8604e82eb67..6c358b7ed336c72fe9984c8f5b33fb3d200c638c 100644 (file)
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -132,14 +132,16 @@ struct symbol_conf {
                         *pid_list_str,
                         *tid_list_str,
                         *sym_list_str,
-                       *col_width_list_str;
+                       *col_width_list_str,
+                       *bt_stop_list_str;
         struct strlist  *dso_list,
                         *comm_list,
                         *sym_list,
                         *dso_from_list,
                         *dso_to_list,
                         *sym_from_list,
-                       *sym_to_list;
+                       *sym_to_list,
+                       *bt_stop_list;
         struct intlist  *pid_list,
                         *tid_list;
         const char      *symfs;
author	David Ahern <dsa@cumulusnetworks.com>
	Fri, 25 Nov 2016 20:00:21 +0000 (13:00 -0700)
committer	Arnaldo Carvalho de Melo <acme@redhat.com>
	Tue, 29 Nov 2016 16:06:19 +0000 (13:06 -0300)
tools/perf/Documentation/perf-script.txt		patch \| blob \| blame \| history
tools/perf/builtin-script.c		patch \| blob \| blame \| history
tools/perf/util/evsel_fprintf.c		patch \| blob \| blame \| history
tools/perf/util/symbol.c		patch \| blob \| blame \| history
tools/perf/util/symbol.h		patch \| blob \| blame \| history