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

Commit 57adc51d authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

perf-record: Remove -M 



Since it is not allowed to create cross-cpu (or
cross-task) buffers, this option is no longer valid.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <20100521090710.582740993@chello.nl>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 0f139300

tools/perf/builtin-record.c

+12 −24
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ static bool call_graph = false; 
static bool			inherit_stat			=  false;

static bool			no_samples			=  false;

static bool			sample_address			=  false;

static bool			multiplex			=  false;

static int			multiplex_fd			=     -1;



static long			samples				=      0;

static u64			bytes_written			=      0;
@@ -366,14 +364,7 @@ static void create_counter(int counter, int cpu) 
		 */

		if (group && group_fd == -1)

			group_fd = fd[nr_cpu][counter][thread_index];

		if (multiplex && multiplex_fd == -1)

			multiplex_fd = fd[nr_cpu][counter][thread_index];



		if (multiplex && fd[nr_cpu][counter][thread_index] != multiplex_fd) {



			ret = ioctl(fd[nr_cpu][counter][thread_index], PERF_EVENT_IOC_SET_OUTPUT, multiplex_fd);

			assert(ret != -1);

		} else {

		event_array[nr_poll].fd = fd[nr_cpu][counter][thread_index];

		event_array[nr_poll].events = POLLIN;

		nr_poll++;
@@ -387,7 +378,6 @@ static void create_counter(int counter, int cpu) 
			error("failed to mmap with %d (%s)\n", errno, strerror(errno));

			exit(-1);

		}

		}



		if (filter != NULL) {

			ret = ioctl(fd[nr_cpu][counter][thread_index],
@@ -820,8 +810,6 @@ static const struct option options[] = { 
		    "Sample addresses"),

	OPT_BOOLEAN('n', "no-samples", &no_samples,

		    "don't sample"),

	OPT_BOOLEAN('M', "multiplex", &multiplex,

		    "multiplex counter output in a single channel"),

	OPT_END()

};