Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 744a971940520cf0818e1fe882b64892c528e6de

Authored by Arnaldo Carvalho de Melo
1 parent 8a4d0b56b0
Exists in master and in 16 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

perf evsel: Ditch evsel->handler.data field 

Not needed since this cset:

  fcf65bf149af: 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>

Showing 9 changed files with 20 additions and 23 deletions Side-by-side Diff

tools/perf/builtin-inject.c
Diff comments   View file @ 744a971
... ... @@ -106,8 +106,8 @@
106 106 struct perf_evsel *evsel,
107 107 struct machine *machine)
108 108 {
109   - if (evsel->handler.func) {
110   - inject_handler f = evsel->handler.func;
  109 + if (evsel->handler) {
  110 + inject_handler f = evsel->handler;
111 111 return f(tool, event, sample, evsel, machine);
112 112 }
113 113  
114 114  
115 115  
... ... @@ -383,11 +383,11 @@
383 383 if (perf_evsel__check_stype(evsel, PERF_SAMPLE_TID, "TID"))
384 384 return -EINVAL;
385 385  
386   - evsel->handler.func = perf_inject__sched_switch;
  386 + evsel->handler = perf_inject__sched_switch;
387 387 } else if (!strcmp(name, "sched:sched_process_exit"))
388   - evsel->handler.func = perf_inject__sched_process_exit;
  388 + evsel->handler = perf_inject__sched_process_exit;
389 389 else if (!strncmp(name, "sched:sched_stat_", 17))
390   - evsel->handler.func = perf_inject__sched_stat;
  390 + evsel->handler = perf_inject__sched_stat;
391 391 }
392 392 }
393 393  
tools/perf/builtin-kmem.c
Diff comments   View file @ 744a971
... ... @@ -317,8 +317,8 @@
317 317  
318 318 dump_printf(" ... thread: %s:%d\n", thread__comm_str(thread), thread->tid);
319 319  
320   - if (evsel->handler.func != NULL) {
321   - tracepoint_handler f = evsel->handler.func;
  320 + if (evsel->handler != NULL) {
  321 + tracepoint_handler f = evsel->handler;
322 322 return f(evsel, sample);
323 323 }
324 324  
tools/perf/builtin-lock.c
Diff comments   View file @ 744a971
... ... @@ -819,8 +819,8 @@
819 819 return -1;
820 820 }
821 821  
822   - if (evsel->handler.func != NULL) {
823   - tracepoint_handler f = evsel->handler.func;
  822 + if (evsel->handler != NULL) {
  823 + tracepoint_handler f = evsel->handler;
824 824 return f(evsel, sample);
825 825 }
826 826  
tools/perf/builtin-sched.c
Diff comments   View file @ 744a971
... ... @@ -1427,8 +1427,8 @@
1427 1427 evsel->hists.stats.total_period += sample->period;
1428 1428 hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE);
1429 1429  
1430   - if (evsel->handler.func != NULL) {
1431   - tracepoint_handler f = evsel->handler.func;
  1430 + if (evsel->handler != NULL) {
  1431 + tracepoint_handler f = evsel->handler;
1432 1432 err = f(tool, evsel, sample, machine);
1433 1433 }
1434 1434  
tools/perf/builtin-timechart.c
Diff comments   View file @ 744a971
... ... @@ -483,8 +483,8 @@
483 483 if (sample->cpu > numcpus)
484 484 numcpus = sample->cpu;
485 485  
486   - if (evsel->handler.func != NULL) {
487   - tracepoint_handler f = evsel->handler.func;
  486 + if (evsel->handler != NULL) {
  487 + tracepoint_handler f = evsel->handler;
488 488 return f(evsel, sample);
489 489 }
490 490  
tools/perf/builtin-trace.c
Diff comments   View file @ 744a971
... ... @@ -1570,7 +1570,7 @@
1570 1570 struct trace *trace = container_of(tool, struct trace, tool);
1571 1571 int err = 0;
1572 1572  
1573   - tracepoint_handler handler = evsel->handler.func;
  1573 + tracepoint_handler handler = evsel->handler;
1574 1574  
1575 1575 if (skip_sample(trace, sample))
1576 1576 return 0;
... ... @@ -1656,7 +1656,7 @@
1656 1656 return;
1657 1657 }
1658 1658  
1659   - evsel->handler.func = trace__vfs_getname;
  1659 + evsel->handler = trace__vfs_getname;
1660 1660 perf_evlist__add(evlist, evsel);
1661 1661 }
1662 1662  
... ... @@ -1768,7 +1768,7 @@
1768 1768 goto next_event;
1769 1769 }
1770 1770  
1771   - handler = evsel->handler.func;
  1771 + handler = evsel->handler;
1772 1772 handler(trace, evsel, &sample);
1773 1773 next_event:
1774 1774 perf_evlist__mmap_consume(evlist, i);
tools/perf/util/evlist.c
Diff comments   View file @ 744a971
... ... @@ -255,7 +255,7 @@
255 255 if (evsel == NULL)
256 256 return -1;
257 257  
258   - evsel->handler.func = handler;
  258 + evsel->handler = handler;
259 259 perf_evlist__add(evlist, evsel);
260 260 return 0;
261 261 }
tools/perf/util/evsel.h
Diff comments   View file @ 744a971
... ... @@ -74,10 +74,7 @@
74 74 off_t id_offset;
75 75 };
76 76 struct cgroup_sel *cgrp;
77   - struct {
78   - void *func;
79   - void *data;
80   - } handler;
  77 + void *handler;
81 78 struct cpu_map *cpus;
82 79 unsigned int sample_size;
83 80 int id_pos;
tools/perf/util/session.c
Diff comments   View file @ 744a971
... ... @@ -1650,9 +1650,9 @@
1650 1650 continue;
1651 1651  
1652 1652 err = -EEXIST;
1653   - if (evsel->handler.func != NULL)
  1653 + if (evsel->handler != NULL)
1654 1654 goto out;
1655   - evsel->handler.func = assocs[i].handler;
  1655 + evsel->handler = assocs[i].handler;
1656 1656 }
1657 1657  
1658 1658 err = 0;