perf tools: Rename ordered_samples struct to ordered_events
tip-bot for Jiri Olsa
merge botCommit-ID: 37e39aa8a8a42ad2fd72b7c7349115dad8297d9c Gitweb: http://git.kernel.org/tip/37e39aa8a8a42ad2fd72b7c7349115dad8297d9c Author: Jiri Olsa <[email protected]> AuthorDate: Sun, 6 Jul 2014 14:23:03 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 12 Aug 2014 12:02:55 -0300
perf tools: Rename ordered_samples struct to ordered_events
Following up with ordered_samples rename for ordered_samples and sample_queue structs to ordered_events and ordered_event structs respectively.
Also changing flush_sample_queue function name to ordered_events_flush.
No functional change was intended.
Signed-off-by Jiri Olsa <[email protected]>
Acked-by David Ahern <[email protected]>
Cc Corey Ashford <[email protected]>
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Jean Pihet <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-kvm.c | 2 +- tools/perf/util/session.c | 118 +++++++++++++++++++++++----------------------- tools/perf/util/session.h | 10 ++-- 3 files changed, 65 insertions(+), 65 deletions(-)
tools/perf/builtin-kvm.c +1 -1
@@ -785,7 +785,7 @@ static int perf_kvm__mmap_read(struct perf_kvm_stat *kvm)/* flush queue after each round in which we processed events */ if (ntotal) { - kvm->session->ordered_samples.next_flush = flush_time; + kvm->session->ordered_events.next_flush = flush_time; err = kvm->tool.finished_round (&kvm->tool,NULL , kvm->session);if (err) {if (kvm->lost_events)
tools/perf/util/session.c +59 -59
233 lines not on this page · raw message
tools/perf/util/session.h +5 -5
@@ -12,19 +12,19 @@#include <linux/rbtree.h> #include <linux/perf_event.h> -struct sample_queue ; +struct ordered_event ;struct ip_callchain ;struct thread ; -struct ordered_samples { +struct ordered_events {u64 last_flush;u64 next_flush;u64 max_timestamp;struct list_head samples;struct list_head sample_cache;struct list_head to_free; -struct sample_queue *sample_buffer; -struct sample_queue *last_sample; +struct ordered_event *sample_buffer; +struct ordered_event *last_sample;int sample_buffer_idx;unsigned int nr_samples; };
@@ -39,7 +39,7 @@ struct perf_session {bool one_mmap;void *one_mmap_addr;u64 one_mmap_offset; -struct ordered_samples ordered_samples; +struct ordered_events ordered_events;struct perf_data_file *file; };