diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-24 08:48:11 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-24 08:48:11 +0200 |
| commit | 2f5e98802350627ad6f2e3cee4d177059fc0c2f2 (patch) | |
| tree | d4bbd2fadb55737c20e96ed0f2db9101c9ba24a0 /tools/perf/tests | |
| parent | aa30a2e03a453aad9fd96c3f2d4a82c3497674e5 (diff) | |
| parent | c1fb5651bb40f9efaf32d280f39e06df7e352673 (diff) | |
| download | linux-rt-2f5e98802350627ad6f2e3cee4d177059fc0c2f2.tar.gz | |
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:
* Show progress on histogram collapsing, that can take a long time, from
Namhyung Kim.
* Support "$vars" meta argument syntax for local variables, allowing
asking for all possible variables at a given probe point to be
collected when it hits, from Masami Hiramatsu.
* Address the root cause of that 'perf sched' stack initialization build
slowdown, by programmatically setting a big array after moving the
global variable back to the stack. Fix from Adrian Hunter.
* Do not repipe attributes to a perf.data file in 'perf inject',
fix from Adrian Hunter
* Change the procps visible command-name of invididual benchmark tests
plus cleanups, from Ingo Molnar.
* Do not accept parse_tag_value() overflow, fix from Adrian Hunter.
* Validate that mmap_pages is not too big. From Adrian Hunter.
* Fix non-debug build, from Adrian Hunter.
* Clarify the "sample parsing" test entry, from Arnaldo Carvalho de Melo.
* Consider PERF_SAMPLE_TRANSACTION in the "sample parsing" test,
from Arnaldo Carvalho de Melo.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/tests')
| -rw-r--r-- | tools/perf/tests/hists_link.c | 2 | ||||
| -rw-r--r-- | tools/perf/tests/sample-parsing.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/tests/hists_link.c b/tools/perf/tests/hists_link.c index 025503a22ff7..b51abcb2c243 100644 --- a/tools/perf/tests/hists_link.c +++ b/tools/perf/tests/hists_link.c @@ -467,7 +467,7 @@ int test__hists_link(void) goto out; list_for_each_entry(evsel, &evlist->entries, node) { - hists__collapse_resort(&evsel->hists); + hists__collapse_resort(&evsel->hists, NULL); if (verbose > 2) print_hists(&evsel->hists); diff --git a/tools/perf/tests/sample-parsing.c b/tools/perf/tests/sample-parsing.c index 77f598dbd97a..61c9da2eb3a9 100644 --- a/tools/perf/tests/sample-parsing.c +++ b/tools/perf/tests/sample-parsing.c @@ -275,8 +275,8 @@ int test__sample_parsing(void) * Fail the test if it has not been updated when new sample format bits * were added. */ - if (PERF_SAMPLE_MAX > PERF_SAMPLE_IDENTIFIER << 1) { - pr_debug("sample format has changed - test needs updating\n"); + if (PERF_SAMPLE_MAX > PERF_SAMPLE_TRANSACTION << 1) { + pr_debug("sample format has changed, some new PERF_SAMPLE_ bit was introduced - test needs updating\n"); return -1; } |