diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-29 06:23:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-29 06:23:32 -0400 |
| commit | aac898548d04c7bff179b79f805874b0d6f87571 (patch) | |
| tree | e8de975fd5de6c95bf4329861a872dbcfe0c7ead /tools/perf/tests/task-exit.c | |
| parent | 2f5e98802350627ad6f2e3cee4d177059fc0c2f2 (diff) | |
| parent | cd65718712469ad844467250e8fad20a5838baae (diff) | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/util/hist.h
Diffstat (limited to 'tools/perf/tests/task-exit.c')
| -rw-r--r-- | tools/perf/tests/task-exit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/tests/task-exit.c b/tools/perf/tests/task-exit.c index b07f8a14e15d..c33d95f9559a 100644 --- a/tools/perf/tests/task-exit.c +++ b/tools/perf/tests/task-exit.c | |||
| @@ -87,10 +87,10 @@ int test__task_exit(void) | |||
| 87 | 87 | ||
| 88 | retry: | 88 | retry: |
| 89 | while ((event = perf_evlist__mmap_read(evlist, 0)) != NULL) { | 89 | while ((event = perf_evlist__mmap_read(evlist, 0)) != NULL) { |
| 90 | if (event->header.type != PERF_RECORD_EXIT) | 90 | if (event->header.type == PERF_RECORD_EXIT) |
| 91 | continue; | 91 | nr_exit++; |
| 92 | 92 | ||
| 93 | nr_exit++; | 93 | perf_evlist__mmap_consume(evlist, 0); |
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | if (!exited || !nr_exit) { | 96 | if (!exited || !nr_exit) { |