diff options
author | Jiri Olsa <jolsa@kernel.org> | 2014-07-20 17:55:45 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-07-24 15:40:47 -0400 |
commit | f1dd1460a40894b00bbeacd753025e9251ec11bd (patch) | |
tree | 89af3d56cf02e2b4a1ae706f9f3e0dd70fae39aa /tools | |
parent | c94b93cbca59435dfc0f2a838fea55bd632145d3 (diff) |
perf session: Fix accounting of ordered samples queue
Properly account flushed samples within the ordered samples queue.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: David Ahern <dsahern@gmail.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jean Pihet <jean.pihet@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1405893363-21967-2-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/util/session.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index fab5838c06be..88dfef70c13d 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c | |||
@@ -509,6 +509,7 @@ static int flush_sample_queue(struct perf_session *s, | |||
509 | os->last_flush = iter->timestamp; | 509 | os->last_flush = iter->timestamp; |
510 | list_del(&iter->list); | 510 | list_del(&iter->list); |
511 | list_add(&iter->list, &os->sample_cache); | 511 | list_add(&iter->list, &os->sample_cache); |
512 | os->nr_samples--; | ||
512 | 513 | ||
513 | if (show_progress) | 514 | if (show_progress) |
514 | ui_progress__update(&prog, 1); | 515 | ui_progress__update(&prog, 1); |
@@ -521,8 +522,6 @@ static int flush_sample_queue(struct perf_session *s, | |||
521 | list_entry(head->prev, struct sample_queue, list); | 522 | list_entry(head->prev, struct sample_queue, list); |
522 | } | 523 | } |
523 | 524 | ||
524 | os->nr_samples = 0; | ||
525 | |||
526 | return 0; | 525 | return 0; |
527 | } | 526 | } |
528 | 527 | ||