diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-11-04 15:14:04 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-11-04 15:14:04 -0500 |
commit | 87968f94fbea47df334502a0db645833ce8a848b (patch) | |
tree | a8acb87cf151aed23aa0f64d2f78567b6eaffc75 /tools/perf/tests/hists_link.c | |
parent | 2a3ede8cb2ddee5885518e4232aca13056f9a6e0 (diff) | |
parent | 6d862b8c14ba539c7c87ffc77f2e1d6dc9630c4d (diff) |
Merge tag 'perf-core-for-mingo' 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:
* Add new COMM infrastructure, further improving histogram processing, from
Frédéric Weisbecker, one fix from Namhyung Kim.
* Enhance option parse error message, showing just the help lines of the
options affected, from Namhyung Kim.
* Fixup PERF_SAMPLE_TRANSACTION handling in sample synthesizing and
'perf test', from Adrian Hunter.
* Set up output options for in-stream attributes, from Adrian Hunter.
* Fix 32-bit cross build, from Adrian Hunter.
* Fix libunwind build and feature detection for 32-bit build, from Adrian Hunter.
* Always use perf_evsel__set_sample_bit to set sample_type, from Adrian Hunter.
perf evlist: Add a debug print if event buffer mmap fails
* Add missing data.h into LIB_H headers, fix from Jiri Olsa.
* libtraceevent updates from upstream trace-cmd repo, from Steven Rostedt.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/tests/hists_link.c')
-rw-r--r-- | tools/perf/tests/hists_link.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/tests/hists_link.c b/tools/perf/tests/hists_link.c index b51abcb2c243..6c337e653540 100644 --- a/tools/perf/tests/hists_link.c +++ b/tools/perf/tests/hists_link.c | |||
@@ -93,7 +93,7 @@ static struct machine *setup_fake_machine(struct machines *machines) | |||
93 | if (thread == NULL) | 93 | if (thread == NULL) |
94 | goto out; | 94 | goto out; |
95 | 95 | ||
96 | thread__set_comm(thread, fake_threads[i].comm); | 96 | thread__set_comm(thread, fake_threads[i].comm, 0); |
97 | } | 97 | } |
98 | 98 | ||
99 | for (i = 0; i < ARRAY_SIZE(fake_mmap_info); i++) { | 99 | for (i = 0; i < ARRAY_SIZE(fake_mmap_info); i++) { |
@@ -110,7 +110,7 @@ static struct machine *setup_fake_machine(struct machines *machines) | |||
110 | strcpy(fake_mmap_event.mmap.filename, | 110 | strcpy(fake_mmap_event.mmap.filename, |
111 | fake_mmap_info[i].filename); | 111 | fake_mmap_info[i].filename); |
112 | 112 | ||
113 | machine__process_mmap_event(machine, &fake_mmap_event); | 113 | machine__process_mmap_event(machine, &fake_mmap_event, NULL); |
114 | } | 114 | } |
115 | 115 | ||
116 | for (i = 0; i < ARRAY_SIZE(fake_symbols); i++) { | 116 | for (i = 0; i < ARRAY_SIZE(fake_symbols); i++) { |
@@ -421,7 +421,7 @@ static void print_hists(struct hists *hists) | |||
421 | he = rb_entry(node, struct hist_entry, rb_node_in); | 421 | he = rb_entry(node, struct hist_entry, rb_node_in); |
422 | 422 | ||
423 | pr_info("%2d: entry: %-8s [%-8s] %20s: period = %"PRIu64"\n", | 423 | pr_info("%2d: entry: %-8s [%-8s] %20s: period = %"PRIu64"\n", |
424 | i, he->thread->comm, he->ms.map->dso->short_name, | 424 | i, thread__comm_str(he->thread), he->ms.map->dso->short_name, |
425 | he->ms.sym->name, he->stat.period); | 425 | he->ms.sym->name, he->stat.period); |
426 | 426 | ||
427 | i++; | 427 | i++; |