perf tools: Add pid/tid filtering to report and script commands

The 'record' and 'top' tools already allow a user to specify a CSV of
pids and/or tids of tasks to collect data.

Add those options to the 'report' and 'script' analysis commands to only
consider samples related to the given pids/tids.

This is also inline with the existing comm option.

Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1427212361-7066-1-git-send-email-dsahern@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/Documentation/perf-report.txt b/tools/perf/Documentation/perf-report.txt
index dd7cccd..4879cf6 100644 (file)
--- a/tools/perf/Documentation/perf-report.txt
+++ b/tools/perf/Documentation/perf-report.txt
@@ -40,6 +40,11 @@ OPTIONS
        Only consider symbols in these comms. CSV that understands
        file://filename entries.  This option will affect the percentage of
        the overhead column.  See --percentage for more info.
+--pid=::
+        Only show events for given process ID (comma separated list).
+
+--tid=::
+        Only show events for given thread ID (comma separated list).
 -d::
 --dsos=::
        Only consider symbols in these dsos. CSV that understands

diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt
index a21eec0..7944575 100644 (file)
--- a/tools/perf/Documentation/perf-script.txt
+++ b/tools/perf/Documentation/perf-script.txt
@@ -193,6 +193,12 @@ OPTIONS
        Only display events for these comms. CSV that understands
        file://filename entries.
 
+--pid=::
+       Only show events for given process ID (comma separated list).
+
+--tid=::
+       Only show events for given thread ID (comma separated list).
+
 -I::
 --show-info::
        Display extended information about the perf.data file. This adds

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 81c2f3b..b5b2ad4 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -669,6 +669,10 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)
                   "only consider symbols in these dsos"),
        OPT_STRING('c', "comms", &symbol_conf.comm_list_str, "comm[,comm...]",
                   "only consider symbols in these comms"),
+       OPT_STRING(0, "pid", &symbol_conf.pid_list_str, "pid[,pid...]",
+                  "only consider symbols in these pids"),
+       OPT_STRING(0, "tid", &symbol_conf.tid_list_str, "tid[,tid...]",
+                  "only consider symbols in these tids"),
        OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",
                   "only consider these symbols"),
        OPT_STRING(0, "symbol-filter", &report.symbol_filter_str, "filter",

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index f2a348b..662366c 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -1562,6 +1562,10 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused)
        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"),
+       OPT_STRING(0, "pid", &symbol_conf.pid_list_str, "pid[,pid...]",
+                  "only consider symbols in these pids"),
+       OPT_STRING(0, "tid", &symbol_conf.tid_list_str, "tid[,tid...]",
+                  "only consider symbols in these tids"),
        OPT_BOOLEAN('I', "show-info", &show_full_info,
                    "display extended information from perf.data file"),
        OPT_BOOLEAN('\0', "show-kernel-path", &symbol_conf.show_kernel_path,

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index a690668..fddeb90 100644 (file)
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -15,6 +15,7 @@
 #include "machine.h"
 #include "symbol.h"
 #include "strlist.h"
+#include "intlist.h"
 #include "header.h"
 
 #include <elf.h>
@@ -1859,6 +1860,20 @@ int setup_list(struct strlist **list, const char *list_str,
        return 0;
 }
 
+int setup_intlist(struct intlist **list, const char *list_str,
+                 const char *list_name)
+{
+       if (list_str == NULL)
+               return 0;
+
+       *list = intlist__new(list_str);
+       if (!*list) {
+               pr_err("problems parsing %s list\n", list_name);
+               return -1;
+       }
+       return 0;
+}
+
 static bool symbol__read_kptr_restrict(void)
 {
        bool value = false;
@@ -1909,9 +1924,17 @@ int symbol__init(struct perf_session_env *env)
                       symbol_conf.comm_list_str, "comm") < 0)
                goto out_free_dso_list;
 
+       if (setup_intlist(&symbol_conf.pid_list,
+                      symbol_conf.pid_list_str, "pid") < 0)
+               goto out_free_comm_list;
+
+       if (setup_intlist(&symbol_conf.tid_list,
+                      symbol_conf.tid_list_str, "tid") < 0)
+               goto out_free_pid_list;
+
        if (setup_list(&symbol_conf.sym_list,
                       symbol_conf.sym_list_str, "symbol") < 0)
-               goto out_free_comm_list;
+               goto out_free_tid_list;
 
        /*
         * A path to symbols of "/" is identical to ""
@@ -1930,6 +1953,10 @@ int symbol__init(struct perf_session_env *env)
        symbol_conf.initialized = true;
        return 0;
 
+out_free_tid_list:
+       intlist__delete(symbol_conf.tid_list);
+out_free_pid_list:
+       intlist__delete(symbol_conf.pid_list);
 out_free_comm_list:
        strlist__delete(symbol_conf.comm_list);
 out_free_dso_list:
@@ -1944,6 +1971,8 @@ void symbol__exit(void)
        strlist__delete(symbol_conf.sym_list);
        strlist__delete(symbol_conf.dso_list);
        strlist__delete(symbol_conf.comm_list);
+       intlist__delete(symbol_conf.tid_list);
+       intlist__delete(symbol_conf.pid_list);
        vmlinux_path__exit();
        symbol_conf.sym_list = symbol_conf.dso_list = symbol_conf.comm_list = NULL;
        symbol_conf.initialized = false;

diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index efdaaa5..0956150 100644 (file)
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -78,6 +78,7 @@ static inline size_t symbol__size(const struct symbol *sym)
 }
 
 struct strlist;
+struct intlist;
 
 struct symbol_conf {
        unsigned short  priv_size;
@@ -115,6 +116,8 @@ struct symbol_conf {
        const char      *guestmount;
        const char      *dso_list_str,
                        *comm_list_str,
+                       *pid_list_str,
+                       *tid_list_str,
                        *sym_list_str,
                        *col_width_list_str;
        struct strlist  *dso_list,
@@ -124,6 +127,8 @@ struct symbol_conf {
                        *dso_to_list,
                        *sym_from_list,
                        *sym_to_list;
+       struct intlist  *pid_list,
+                       *tid_list;
        const char      *symfs;
 };
 
@@ -295,5 +300,7 @@ int compare_proc_modules(const char *from, const char *to);
 
 int setup_list(struct strlist **list, const char *list_str,
               const char *list_name);
+int setup_intlist(struct intlist **list, const char *list_str,
+                 const char *list_name);
 
 #endif /* __PERF_SYMBOL */

diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
index 783b668..9b8a54d 100644 (file)
--- a/tools/perf/util/thread.h
+++ b/tools/perf/util/thread.h
@@ -7,6 +7,7 @@
 #include <sys/types.h>
 #include "symbol.h"
 #include <strlist.h>
+#include <intlist.h>
 
 struct thread_stack;
 
@@ -100,6 +101,16 @@ static inline bool thread__is_filtered(struct thread *thread)
                return true;
        }
 
+       if (symbol_conf.pid_list &&
+           !intlist__has_entry(symbol_conf.pid_list, thread->pid_)) {
+               return true;
+       }
+
+       if (symbol_conf.tid_list &&
+           !intlist__has_entry(symbol_conf.tid_list, thread->tid)) {
+               return true;
+       }
+
        return false;
 }