Skip to content

Commit

Permalink
perf trace: Honor target pid / tid options when analyzing a file
Browse files Browse the repository at this point in the history
Allows capture of raw_syscall events for all processes or threads in a
task and then analyzing specific ones.

Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1377750593-48046-4-git-send-email-dsahern@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
David Ahern authored and Arnaldo Carvalho de Melo committed Aug 29, 2013
1 parent 6810fc9 commit bdc8966
Showing 1 changed file with 43 additions and 0 deletions.
43 changes: 43 additions & 0 deletions tools/perf/builtin-trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "util/thread.h"
#include "util/parse-options.h"
#include "util/strlist.h"
#include "util/intlist.h"
#include "util/thread_map.h"

#include <libaudit.h>
Expand Down Expand Up @@ -259,6 +260,8 @@ struct trace {
unsigned long nr_events;
struct strlist *ev_qualifier;
bool not_ev_qualifier;
struct intlist *tid_list;
struct intlist *pid_list;
bool sched;
bool multiple_threads;
double duration_filter;
Expand Down Expand Up @@ -653,6 +656,18 @@ static int trace__sched_stat_runtime(struct trace *trace, struct perf_evsel *evs
return 0;
}

static bool skip_sample(struct trace *trace, struct perf_sample *sample)
{
if ((trace->pid_list && intlist__find(trace->pid_list, sample->pid)) ||
(trace->tid_list && intlist__find(trace->tid_list, sample->tid)))
return false;

if (trace->pid_list || trace->tid_list)
return true;

return false;
}

static int trace__process_sample(struct perf_tool *tool,
union perf_event *event __maybe_unused,
struct perf_sample *sample,
Expand All @@ -664,6 +679,9 @@ static int trace__process_sample(struct perf_tool *tool,

tracepoint_handler handler = evsel->handler.func;

if (skip_sample(trace, sample))
return 0;

if (trace->base_time == 0)
trace->base_time = sample->time;

Expand All @@ -683,6 +701,27 @@ perf_session__has_tp(struct perf_session *session, const char *name)
return evsel != NULL;
}

static int parse_target_str(struct trace *trace)
{
if (trace->opts.target.pid) {
trace->pid_list = intlist__new(trace->opts.target.pid);
if (trace->pid_list == NULL) {
pr_err("Error parsing process id string\n");
return -EINVAL;
}
}

if (trace->opts.target.tid) {
trace->tid_list = intlist__new(trace->opts.target.tid);
if (trace->tid_list == NULL) {
pr_err("Error parsing thread id string\n");
return -EINVAL;
}
}

return 0;
}

static int trace__run(struct trace *trace, int argc, const char **argv)
{
struct perf_evlist *evlist = perf_evlist__new();
Expand Down Expand Up @@ -869,6 +908,10 @@ static int trace__replay(struct trace *trace)
goto out;
}

err = parse_target_str(trace);
if (err != 0)
goto out;

setup_pager();

err = perf_session__process_events(session, &trace->tool);
Expand Down

0 comments on commit bdc8966

Please sign in to comment.