aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2011-01-12 14:11:53 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2011-01-22 16:56:29 -0500
commit115d2d8963a426670ac3ce983fc4c4e001703943 (patch)
treec37115abbf95a7c68b0a99b1cf60e0ee0e48b7ea /tools/perf
parent744bd8aa3c8b43447f689a27872fa95e700b8a4f (diff)
perf record: Move perf_mmap__write_tail to perf.h
Close to perf_mmap__read_head() and the perf_mmap struct definition. This is useful for any recorder, and we will need it in 'perf test'. Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Tom Zanussi <tzanussi@gmail.com> LKML-Reference: <new-submission> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/builtin-record.c13
-rw-r--r--tools/perf/perf.h12
2 files changed, 13 insertions, 12 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index d89e2f106a62..109f3b269ac5 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -80,17 +80,6 @@ static const char *cpu_list;
80 80
81static struct perf_mmap mmap_array[MAX_NR_CPUS]; 81static struct perf_mmap mmap_array[MAX_NR_CPUS];
82 82
83static void mmap_write_tail(struct perf_mmap *md, unsigned long tail)
84{
85 struct perf_event_mmap_page *pc = md->base;
86
87 /*
88 * ensure all reads are done before we write the tail out.
89 */
90 /* mb(); */
91 pc->data_tail = tail;
92}
93
94static void advance_output(size_t size) 83static void advance_output(size_t size)
95{ 84{
96 bytes_written += size; 85 bytes_written += size;
@@ -165,7 +154,7 @@ static void mmap_read(struct perf_mmap *md)
165 write_output(buf, size); 154 write_output(buf, size);
166 155
167 md->prev = old; 156 md->prev = old;
168 mmap_write_tail(md, old); 157 perf_mmap__write_tail(md, old);
169} 158}
170 159
171static volatile int done = 0; 160static volatile int done = 0;
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 5fb5e1f11d1c..a5fc660c1f12 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -108,6 +108,18 @@ static inline unsigned int perf_mmap__read_head(struct perf_mmap *mm)
108 return head; 108 return head;
109} 109}
110 110
111static inline void perf_mmap__write_tail(struct perf_mmap *md,
112 unsigned long tail)
113{
114 struct perf_event_mmap_page *pc = md->base;
115
116 /*
117 * ensure all reads are done before we write the tail out.
118 */
119 /* mb(); */
120 pc->data_tail = tail;
121}
122
111/* 123/*
112 * prctl(PR_TASK_PERF_EVENTS_DISABLE) will (cheaply) disable all 124 * prctl(PR_TASK_PERF_EVENTS_DISABLE) will (cheaply) disable all
113 * counters in the current task. 125 * counters in the current task.