From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
Corey Ashford <cjashfor@linux.vnet.ibm.com>,
David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Jean Pihet <jean.pihet@linaro.org>,
Namhyung Kim <namhyung@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 23/27] perf session: Fix accounting of ordered samples queue
Date: Fri, 25 Jul 2014 12:37:05 -0300 [thread overview]
Message-ID: <1406302629-11790-24-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1406302629-11790-1-git-send-email-acme@kernel.org>
From: Jiri Olsa <jolsa@kernel.org>
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>
---
tools/perf/util/session.c | 3 +--
1 file changed, 1 insertion(+), 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,
os->last_flush = iter->timestamp;
list_del(&iter->list);
list_add(&iter->list, &os->sample_cache);
+ os->nr_samples--;
if (show_progress)
ui_progress__update(&prog, 1);
@@ -521,8 +522,6 @@ static int flush_sample_queue(struct perf_session *s,
list_entry(head->prev, struct sample_queue, list);
}
- os->nr_samples = 0;
-
return 0;
}
--
1.9.3
next prev parent reply other threads:[~2014-07-25 15:40 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-25 15:36 [GIT PULL 00/27] perf/core improvements and fixes Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 01/27] perf tools: Fix incorrect fd error comparison Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 02/27] perf tools: Fix jump label always changing during tracing Arnaldo Carvalho de Melo
2014-07-28 6:58 ` Peter Zijlstra
2014-07-28 8:19 ` Jiri Olsa
2014-07-28 10:49 ` Ingo Molnar
2014-07-30 12:55 ` [tip:perf/core] Revert "perf tools: Fix jump label always changing during tracing" tip-bot for Jiri Olsa
2014-07-25 15:36 ` [PATCH 03/27] perf script: Improve srcline display for BTS Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 04/27] perf script: Do not print dangling '=>' " Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 05/27] perf tools: Record whether a dso has data Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 06/27] perf tools: Add dso__data_status_seen() Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 07/27] perf tools: Add dsos__hit_all() Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 08/27] perf tools: Add cpu to struct thread Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 09/27] perf machine: Add ability to record the current tid for each cpu Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 10/27] perf tools: Move rdtsc() function Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 11/27] perf tools: Add dso__data_size() Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 12/27] perf tools: Pass machine to vdso__dso_findnew() Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 13/27] perf session: Add ability to 'skip' a non-piped event stream Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 14/27] perf session: Add ability to skip 4GiB or more Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 15/27] perf tools: Group VDSO global variables into a structure Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 16/27] perf machine: Fix the lifetime of the VDSO temporary file Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 17/27] perf tools: Add vdso__new() Arnaldo Carvalho de Melo
2014-07-25 15:37 ` [PATCH 18/27] perf tools: Separate the VDSO map name from the VDSO dso name Arnaldo Carvalho de Melo
2014-07-25 15:37 ` [PATCH 19/27] perf tools: Add dso__type() Arnaldo Carvalho de Melo
2014-07-25 15:37 ` [PATCH 20/27] perf tools: Add thread parameter to vdso__dso_findnew() Arnaldo Carvalho de Melo
2014-07-25 15:37 ` [PATCH 21/27] perf tools: Fix build on gcc 4.4.7 Arnaldo Carvalho de Melo
2014-07-25 15:37 ` [PATCH 22/27] perf powerpc: Include util/util.h and remove stringify macros Arnaldo Carvalho de Melo
2014-07-25 15:37 ` Arnaldo Carvalho de Melo [this message]
2014-07-25 15:37 ` [PATCH 24/27] perf tools: Expose 'addr' functions so they can be reused Arnaldo Carvalho de Melo
2014-07-25 15:37 ` [PATCH 25/27] perf inject: Add --kallsyms parameter Arnaldo Carvalho de Melo
2014-07-25 15:37 ` [PATCH 26/27] perf record: Always force PERF_RECORD_FINISHED_ROUND event Arnaldo Carvalho de Melo
2014-07-25 15:37 ` [PATCH 27/27] perf record: Store PERF_RECORD_FINISHED_ROUND only for nonempty rounds Arnaldo Carvalho de Melo
2014-07-28 8:10 ` [GIT PULL 00/27] perf/core improvements and fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1406302629-11790-24-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=dsahern@gmail.com \
--cc=fweisbec@gmail.com \
--cc=jean.pihet@linaro.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome