leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf script: Pass perf_script into process_event

Browse Source 
Passing perf_script struct into process_event function, so we could
process configuration data for event printing.

It will be used in following patch to get event name string width.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20151126175521.GA18979@krava.brq.redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2015-11-26 18:55:21 +01:00 committed by Arnaldo Carvalho de Melo
parent b2be5451f6
commit 809e9423d7
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/perf/builtin-script.c
View File

@ -588,8 +588,17 @@ static void print_sample_flags(u32 flags)
printf(" %-4s ", str); printf(" %-4s ", str);
} }
static void process_event(union perf_event *event, struct perf_sample *sample, struct perf_script {
struct perf_evsel *evsel, struct addr_location *al) struct perf_tool tool;
struct perf_session *session;
bool show_task_events;
bool show_mmap_events;
bool show_switch_events;
};
static void process_event(struct perf_script *script __maybe_unused, union perf_event *event,
struct perf_sample *sample, struct perf_evsel *evsel,
struct addr_location *al)
{ {
struct thread *thread = al->thread; struct thread *thread = al->thread;
struct perf_event_attr *attr = &evsel->attr; struct perf_event_attr *attr = &evsel->attr;
@ -663,12 +672,13 @@ static int cleanup_scripting(void)
return scripting_ops ? scripting_ops->stop_script() : 0; return scripting_ops ? scripting_ops->stop_script() : 0;
} }
static int process_sample_event(struct perf_tool *tool __maybe_unused, static int process_sample_event(struct perf_tool *tool,
union perf_event *event, union perf_event *event,
struct perf_sample *sample, struct perf_sample *sample,
struct perf_evsel *evsel, struct perf_evsel *evsel,
struct machine *machine) struct machine *machine)
{ {
struct perf_script *scr = container_of(tool, struct perf_script, tool);
struct addr_location al; struct addr_location al;
if (debug_mode) { if (debug_mode) {
@ -697,21 +707,13 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,
if (scripting_ops) if (scripting_ops)
scripting_ops->process_event(event, sample, evsel, &al); scripting_ops->process_event(event, sample, evsel, &al);
else else
process_event(event, sample, evsel, &al); process_event(scr, event, sample, evsel, &al);
out_put: out_put:
addr_location__put(&al); addr_location__put(&al);
return 0; return 0;
} }
struct perf_script {
struct perf_tool tool;
struct perf_session *session;
bool show_task_events;
bool show_mmap_events;
bool show_switch_events;
};
static int process_attr(struct perf_tool *tool, union perf_event *event, static int process_attr(struct perf_tool *tool, union perf_event *event,
struct perf_evlist **pevlist) struct perf_evlist **pevlist)
{ {