Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 115d2d89 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 744bd8aa

tools/perf/builtin-record.c

+1 −12
Original line number Original line Diff line number Diff line
@@ -80,17 +80,6 @@ static const char *cpu_list; 




static struct perf_mmap		mmap_array[MAX_NR_CPUS];

static struct perf_mmap		mmap_array[MAX_NR_CPUS];





static void mmap_write_tail(struct perf_mmap *md, unsigned long tail)

{

	struct perf_event_mmap_page *pc = md->base;



	/*

	 * ensure all reads are done before we write the tail out.

	 */

	/* mb(); */

	pc->data_tail = tail;

}



static void advance_output(size_t size)

static void advance_output(size_t size)

{

{

	bytes_written += size;

	bytes_written += size;
@@ -165,7 +154,7 @@ static void mmap_read(struct perf_mmap *md) 
	write_output(buf, size);

	write_output(buf, size);





	md->prev = old;

	md->prev = old;

	mmap_write_tail(md, old);

	perf_mmap__write_tail(md, old);

}

}





static volatile int done = 0;

static volatile int done = 0;

tools/perf/perf.h

+12 −0
Original line number Original line Diff line number Diff line
@@ -108,6 +108,18 @@ static inline unsigned int perf_mmap__read_head(struct perf_mmap *mm) 
	return head;

	return head;

}

}





static inline void perf_mmap__write_tail(struct perf_mmap *md,

					 unsigned long tail)

{

	struct perf_event_mmap_page *pc = md->base;



	/*

	 * ensure all reads are done before we write the tail out.

	 */

	/* mb(); */

	pc->data_tail = tail;

}



/*

/*

 * prctl(PR_TASK_PERF_EVENTS_DISABLE) will (cheaply) disable all

 * prctl(PR_TASK_PERF_EVENTS_DISABLE) will (cheaply) disable all

 * counters in the current task.

 * counters in the current task.