diff options
| author | Ingo Molnar | 2013-09-06 14:08:08 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2013-09-06 14:08:08 +0200 |
| commit | 72f4a11d2fb16792f5e5107922652366194cfd66 (patch) | |
| tree | 44429da06dafd36090000092e02be2e9cc0b4f44 /tools/perf/util/session.c | |
| parent | Merge branch 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | perf session: Separate progress bar update when processing events (diff) | |
| download | kernel-qcow2-linux-72f4a11d2fb16792f5e5107922652366194cfd66.tar.gz kernel-qcow2-linux-72f4a11d2fb16792f5e5107922652366194cfd66.tar.xz kernel-qcow2-linux-72f4a11d2fb16792f5e5107922652366194cfd66.zip | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
* Fix parsing with no sample_id_all bit set, this regression prevents perf
from reading old perf.data files generated in systems where
perf_event_attr.sample_id_all isn't available, from Adrian Hunter.
* Add signal checking to the inner 'perf trace' event processing loop, allowing
faster response to control+C.
* Fix formatting of long symbol names removing the hardcoding of a buffer
size used to format histogram entries, which was truncating the lines.
* Separate progress bar update when processing events, reducing potentially big
overhead in not needed TUI progress bar screen updates, from Jiri Olsa.
* Fix 'perf trace' build in architectures where MAP_32BIT is not defined, from
Kyle McMartin.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/session.c')
| -rw-r--r-- | tools/perf/util/session.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 1fc0c628683e..476caa129a20 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -504,6 +504,7 @@ static int flush_sample_queue(struct perf_session *s, u64 limit = os->next_flush; u64 last_ts = os->last_sample ? os->last_sample->timestamp : 0ULL; unsigned idx = 0, progress_next = os->nr_samples / 16; + bool show_progress = limit == ULLONG_MAX; int ret; if (!tool->ordered_samples || !limit) @@ -526,7 +527,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); - if (++idx >= progress_next) { + if (show_progress && (++idx >= progress_next)) { progress_next += os->nr_samples / 16; ui_progress__update(idx, os->nr_samples, "Processing time ordered events..."); |