diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-08-23 12:29:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-08-23 12:29:17 +0200 |
| commit | 49c46457caadb8c170fd841bd8051e03062d9b8b (patch) | |
| tree | e3ee50fdf080ed6fb1c48c835cff27aee85b9e03 /tools/perf/util/event.c | |
| parent | 4e92b18e5b0b61211f4511cdbc5803300eeead40 (diff) | |
| parent | d9c5c083416500e95da098c01be092b937def7fa (diff) | |
Merge tag 'perf-core-for-mingo-5.4-20190822' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
perf c2c:
Ravi Bangoria:
- Fix report with offline CPUs.
libperf:
Gerald BAEZA:
- Fix alignment trap with xyarray contents in 'perf stat', noticed on ARMv7.
Jiri Olsa:
- Move some more cpu_map and thread_map methods from tools/perf/util/ to libperf.
headers:
Arnaldo Carvalho de Melo:
- Do some house cleaning on the headers, removing needless includes in some places,
providing forward declarations when those are the only thing needed, and fixing
up the fallout from that for cases where we were using stuff and not adding the
necessary headers. Should speed up the build and avoid needless rebuilds when
something unrelated gets touched.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/event.c')
| -rw-r--r-- | tools/perf/util/event.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index f440fdc3e953..332edef8d394 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -647,7 +647,7 @@ int perf_event__synthesize_thread_map(struct perf_tool *tool, for (thread = 0; thread < threads->nr; ++thread) { if (__event__synthesize_thread(comm_event, mmap_event, fork_event, namespaces_event, - thread_map__pid(threads, thread), 0, + perf_thread_map__pid(threads, thread), 0, process, tool, machine, mmap_data)) { err = -1; @@ -658,12 +658,12 @@ int perf_event__synthesize_thread_map(struct perf_tool *tool, * comm.pid is set to thread group id by * perf_event__synthesize_comm */ - if ((int) comm_event->comm.pid != thread_map__pid(threads, thread)) { + if ((int) comm_event->comm.pid != perf_thread_map__pid(threads, thread)) { bool need_leader = true; /* is thread group leader in thread_map? */ for (j = 0; j < threads->nr; ++j) { - if ((int) comm_event->comm.pid == thread_map__pid(threads, j)) { + if ((int) comm_event->comm.pid == perf_thread_map__pid(threads, j)) { need_leader = false; break; } @@ -997,7 +997,7 @@ int perf_event__synthesize_thread_map2(struct perf_tool *tool, if (!comm) comm = (char *) ""; - entry->pid = thread_map__pid(threads, i); + entry->pid = perf_thread_map__pid(threads, i); strncpy((char *) &entry->comm, comm, sizeof(entry->comm)); } @@ -1055,7 +1055,7 @@ static size_t mask_size(struct perf_cpu_map *map, int *max) void *cpu_map_data__alloc(struct perf_cpu_map *map, size_t *size, u16 *type, int *max) { size_t size_cpus, size_mask; - bool is_dummy = cpu_map__empty(map); + bool is_dummy = perf_cpu_map__empty(map); /* * Both array and mask data have variable size based |