Skip to content

Commit

Permalink
perf trace: Add perf_event parameter to tracepoint_handler
Browse files Browse the repository at this point in the history
It will be used by next pagefault tracing patches in the series.

Signed-off-by: Stanislav Fomichev <stfomichev@yandex-team.ru>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1403799268-1367-2-git-send-email-stfomichev@yandex-team.ru
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Stanislav Fomichev authored and Arnaldo Carvalho de Melo committed Jun 26, 2014
1 parent 0710087 commit 0c82adc
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions tools/perf/builtin-trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -1538,6 +1538,7 @@ static size_t syscall__scnprintf_args(struct syscall *sc, char *bf, size_t size,
}

typedef int (*tracepoint_handler)(struct trace *trace, struct perf_evsel *evsel,
union perf_event *event,
struct perf_sample *sample);

static struct syscall *trace__syscall_info(struct trace *trace,
Expand Down Expand Up @@ -1610,6 +1611,7 @@ static void thread__update_stats(struct thread_trace *ttrace,
}

static int trace__sys_enter(struct trace *trace, struct perf_evsel *evsel,
union perf_event *event __maybe_unused,
struct perf_sample *sample)
{
char *msg;
Expand Down Expand Up @@ -1658,6 +1660,7 @@ static int trace__sys_enter(struct trace *trace, struct perf_evsel *evsel,
}

static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel,
union perf_event *event __maybe_unused,
struct perf_sample *sample)
{
int ret;
Expand Down Expand Up @@ -1735,13 +1738,15 @@ static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel,
}

static int trace__vfs_getname(struct trace *trace, struct perf_evsel *evsel,
union perf_event *event __maybe_unused,
struct perf_sample *sample)
{
trace->last_vfs_getname = perf_evsel__rawptr(evsel, sample, "pathname");
return 0;
}

static int trace__sched_stat_runtime(struct trace *trace, struct perf_evsel *evsel,
union perf_event *event __maybe_unused,
struct perf_sample *sample)
{
u64 runtime = perf_evsel__intval(evsel, sample, "runtime");
Expand Down Expand Up @@ -1781,7 +1786,7 @@ static bool skip_sample(struct trace *trace, struct perf_sample *sample)
}

static int trace__process_sample(struct perf_tool *tool,
union perf_event *event __maybe_unused,
union perf_event *event,
struct perf_sample *sample,
struct perf_evsel *evsel,
struct machine *machine __maybe_unused)
Expand All @@ -1799,7 +1804,7 @@ static int trace__process_sample(struct perf_tool *tool,

if (handler) {
++trace->nr_events;
handler(trace, evsel, sample);
handler(trace, evsel, event, sample);
}

return err;
Expand Down Expand Up @@ -1990,7 +1995,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
}

handler = evsel->handler;
handler(trace, evsel, &sample);
handler(trace, evsel, event, &sample);
next_event:
perf_evlist__mmap_consume(evlist, i);

Expand Down

0 comments on commit 0c82adc

Please sign in to comment.