lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf evsel: Ditch evsel->handler.data field

Browse Source 
Not needed since this cset:

  fcf65bf149: perf evsel: Cache associated event_format

So lets trim this struct a bit.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.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/n/tip-j8setslokt0goiwxq9dogzqm@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo
2013-11-06 10:17:38 -03:00
parent 8a4d0b56b0
commit 744a971940
9 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/perf/builtin-inject.c
View File

@@ -106,8 +106,8 @@ static int perf_event__repipe_sample(struct perf_tool *tool,
struct perf_evsel *evsel, struct perf_evsel *evsel,
struct machine *machine) struct machine *machine)
{ {
if (evsel->handler.func) { if (evsel->handler) {
inject_handler f = evsel->handler.func; inject_handler f = evsel->handler;
return f(tool, event, sample, evsel, machine); return f(tool, event, sample, evsel, machine);
} }
@@ -383,11 +383,11 @@ static int __cmd_inject(struct perf_inject *inject)
if (perf_evsel__check_stype(evsel, PERF_SAMPLE_TID, "TID")) if (perf_evsel__check_stype(evsel, PERF_SAMPLE_TID, "TID"))
return -EINVAL; return -EINVAL;
evsel->handler.func = perf_inject__sched_switch; evsel->handler = perf_inject__sched_switch;
} else if (!strcmp(name, "sched:sched_process_exit")) } else if (!strcmp(name, "sched:sched_process_exit"))
evsel->handler.func = perf_inject__sched_process_exit; evsel->handler = perf_inject__sched_process_exit;
else if (!strncmp(name, "sched:sched_stat_", 17)) else if (!strncmp(name, "sched:sched_stat_", 17))
evsel->handler.func = perf_inject__sched_stat; evsel->handler = perf_inject__sched_stat;
} }
} }

4
tools/perf/builtin-kmem.c
View File

@@ -317,8 +317,8 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,
dump_printf(" ... thread: %s:%d\n", thread__comm_str(thread), thread->tid); dump_printf(" ... thread: %s:%d\n", thread__comm_str(thread), thread->tid);
if (evsel->handler.func != NULL) { if (evsel->handler != NULL) {
tracepoint_handler f = evsel->handler.func; tracepoint_handler f = evsel->handler;
return f(evsel, sample); return f(evsel, sample);
} }

4
tools/perf/builtin-lock.c
View File

@@ -819,8 +819,8 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,
return -1; return -1;
} }
if (evsel->handler.func != NULL) { if (evsel->handler != NULL) {
tracepoint_handler f = evsel->handler.func; tracepoint_handler f = evsel->handler;
return f(evsel, sample); return f(evsel, sample);
} }

4
tools/perf/builtin-sched.c
View File

@@ -1427,8 +1427,8 @@ static int perf_sched__process_tracepoint_sample(struct perf_tool *tool __maybe_
evsel->hists.stats.total_period += sample->period; evsel->hists.stats.total_period += sample->period;
hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE); hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE);
if (evsel->handler.func != NULL) { if (evsel->handler != NULL) {
tracepoint_handler f = evsel->handler.func; tracepoint_handler f = evsel->handler;
err = f(tool, evsel, sample, machine); err = f(tool, evsel, sample, machine);
} }

4
tools/perf/builtin-timechart.c
View File

@@ -483,8 +483,8 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,
if (sample->cpu > numcpus) if (sample->cpu > numcpus)
numcpus = sample->cpu; numcpus = sample->cpu;
if (evsel->handler.func != NULL) { if (evsel->handler != NULL) {
tracepoint_handler f = evsel->handler.func; tracepoint_handler f = evsel->handler;
return f(evsel, sample); return f(evsel, sample);
} }

6
tools/perf/builtin-trace.c
View File

@@ -1570,7 +1570,7 @@ static int trace__process_sample(struct perf_tool *tool,
struct trace *trace = container_of(tool, struct trace, tool); struct trace *trace = container_of(tool, struct trace, tool);
int err = 0; int err = 0;
tracepoint_handler handler = evsel->handler.func; tracepoint_handler handler = evsel->handler;
if (skip_sample(trace, sample)) if (skip_sample(trace, sample))
return 0; return 0;
@@ -1656,7 +1656,7 @@ static void perf_evlist__add_vfs_getname(struct perf_evlist *evlist)
return; return;
} }
evsel->handler.func = trace__vfs_getname; evsel->handler = trace__vfs_getname;
perf_evlist__add(evlist, evsel); perf_evlist__add(evlist, evsel);
} }
@@ -1768,7 +1768,7 @@ again:
goto next_event; goto next_event;
} }
handler = evsel->handler.func; handler = evsel->handler;
handler(trace, evsel, &sample); handler(trace, evsel, &sample);
next_event: next_event:
perf_evlist__mmap_consume(evlist, i); perf_evlist__mmap_consume(evlist, i);

2
tools/perf/util/evlist.c
View File

@@ -255,7 +255,7 @@ int perf_evlist__add_newtp(struct perf_evlist *evlist,
if (evsel == NULL) if (evsel == NULL)
return -1; return -1;
evsel->handler.func = handler; evsel->handler = handler;
perf_evlist__add(evlist, evsel); perf_evlist__add(evlist, evsel);
return 0; return 0;
} }

5
tools/perf/util/evsel.h
View File

@@ -74,10 +74,7 @@ struct perf_evsel {
off_t id_offset; off_t id_offset;
}; };
struct cgroup_sel *cgrp; struct cgroup_sel *cgrp;
struct { void *handler;
void *func;
void *data;
} handler;
struct cpu_map *cpus; struct cpu_map *cpus;
unsigned int sample_size; unsigned int sample_size;
int id_pos; int id_pos;

4
tools/perf/util/session.c
View File

@@ -1650,9 +1650,9 @@ int __perf_session__set_tracepoints_handlers(struct perf_session *session,
continue; continue;
err = -EEXIST; err = -EEXIST;
if (evsel->handler.func != NULL) if (evsel->handler != NULL)
goto out; goto out;
evsel->handler.func = assocs[i].handler; evsel->handler = assocs[i].handler;
} }
err = 0; err = 0;