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

Commit 2aaecfc5 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf script: Remove default_scripting_ops 



The default script handler (the one that displays samples on screen) is
implemented scripting_ops instance with process_event callback.

This way we can't pass any script config into display function, because
we don't want perl or python handlers to be depended on perf script
internals.

Removing the default_scripting_ops and calling process event function
directly. This way it's possible to pass perf_script struct and process
configuration data in following commit.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1448546125-29245-1-git-send-email-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 0356218a

tools/perf/builtin-script.c

+7 −36
Original line number Original line Diff line number Diff line
@@ -643,57 +643,24 @@ static void process_event(union perf_event *event, struct perf_sample *sample, 
	printf("\n");

	printf("\n");

}

}





static int default_start_script(const char *script __maybe_unused,

				int argc __maybe_unused,

				const char **argv __maybe_unused)

{

	return 0;

}



static int default_flush_script(void)

{

	return 0;

}



static int default_stop_script(void)

{

	return 0;

}



static int default_generate_script(struct pevent *pevent __maybe_unused,

				   const char *outfile __maybe_unused)

{

	return 0;

}



static struct scripting_ops default_scripting_ops = {

	.start_script		= default_start_script,

	.flush_script		= default_flush_script,

	.stop_script		= default_stop_script,

	.process_event		= process_event,

	.generate_script	= default_generate_script,

};



static struct scripting_ops	*scripting_ops;

static struct scripting_ops	*scripting_ops;





static void setup_scripting(void)

static void setup_scripting(void)

{

{

	setup_perl_scripting();

	setup_perl_scripting();

	setup_python_scripting();

	setup_python_scripting();



	scripting_ops = &default_scripting_ops;

}

}





static int flush_scripting(void)

static int flush_scripting(void)

{

{

	return scripting_ops->flush_script();

	return scripting_ops ? scripting_ops->flush_script() : 0;

}

}





static int cleanup_scripting(void)

static int cleanup_scripting(void)

{

{

	pr_debug("\nperf script stopped\n");

	pr_debug("\nperf script stopped\n");





	return scripting_ops->stop_script();

	return scripting_ops ? scripting_ops->stop_script() : 0;

}

}





static int process_sample_event(struct perf_tool *tool __maybe_unused,

static int process_sample_event(struct perf_tool *tool __maybe_unused,
@@ -727,7 +694,11 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused, 
	if (cpu_list && !test_bit(sample->cpu, cpu_bitmap))

	if (cpu_list && !test_bit(sample->cpu, cpu_bitmap))

		goto out_put;

		goto out_put;





	if (scripting_ops)

		scripting_ops->process_event(event, sample, evsel, &al);

		scripting_ops->process_event(event, sample, evsel, &al);

	else

		process_event(event, sample, evsel, &al);



out_put:

out_put:

	addr_location__put(&al);

	addr_location__put(&al);

	return 0;

	return 0;