perf/scripts: Move Perl scripting files to scripting-engines dir (82d156cd) · Commits · e / devices / android_kernel_fairphone_FP4

tools/perf/Makefile

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -385,7 +385,6 @@ LIB_H += util/sort.h
	LIB_H += util/hist.h		LIB_H += util/hist.h
	LIB_H += util/thread.h		LIB_H += util/thread.h
	LIB_H += util/trace-event.h		LIB_H += util/trace-event.h
	LIB_H += util/trace-event-perl.h
	LIB_H += util/probe-finder.h		LIB_H += util/probe-finder.h
	LIB_H += util/probe-event.h		LIB_H += util/probe-event.h

	@@ -428,7 +427,7 @@ LIB_OBJS += util/thread.o
	LIB_OBJS += util/trace-event-parse.o		LIB_OBJS += util/trace-event-parse.o
	LIB_OBJS += util/trace-event-read.o		LIB_OBJS += util/trace-event-read.o
	LIB_OBJS += util/trace-event-info.o		LIB_OBJS += util/trace-event-info.o
	LIB_OBJS += util/trace-event-perl.o		LIB_OBJS += util/trace-event-scripting.o
	LIB_OBJS += util/svghelper.o		LIB_OBJS += util/svghelper.o
	LIB_OBJS += util/sort.o		LIB_OBJS += util/sort.o
	LIB_OBJS += util/hist.o		LIB_OBJS += util/hist.o
	@@ -519,6 +518,7 @@ ifneq ($(shell sh -c "(echo '\#include <EXTERN.h>'; echo '\#include <perl.h>'; e
	BASIC_CFLAGS += -DNO_LIBPERL		BASIC_CFLAGS += -DNO_LIBPERL
	else		else
	ALL_LDFLAGS += $(PERL_EMBED_LDOPTS)		ALL_LDFLAGS += $(PERL_EMBED_LDOPTS)
			LIB_OBJS += util/scripting-engines/trace-event-perl.o
	LIB_OBJS += scripts/perl/Perf-Trace-Util/Context.o		LIB_OBJS += scripts/perl/Perf-Trace-Util/Context.o
	endif		endif

	@@ -893,8 +893,8 @@ util/hweight.o: ../../lib/hweight.c PERF-CFLAGS
	util/find_next_bit.o: ../../lib/find_next_bit.c PERF-CFLAGS		util/find_next_bit.o: ../../lib/find_next_bit.c PERF-CFLAGS
	$(QUIET_CC)$(CC) -o util/find_next_bit.o -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<		$(QUIET_CC)$(CC) -o util/find_next_bit.o -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<

	util/trace-event-perl.o: util/trace-event-perl.c PERF-CFLAGS		util/scripting-engines/trace-event-perl.o: util/scripting-engines/trace-event-perl.c PERF-CFLAGS
	$(QUIET_CC)$(CC) -o util/trace-event-perl.o -c $(ALL_CFLAGS) $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-shadow $<		$(QUIET_CC)$(CC) -o util/scripting-engines/trace-event-perl.o -c $(ALL_CFLAGS) $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-shadow $<

	scripts/perl/Perf-Trace-Util/Context.o: scripts/perl/Perf-Trace-Util/Context.c PERF-CFLAGS		scripts/perl/Perf-Trace-Util/Context.o: scripts/perl/Perf-Trace-Util/Context.c PERF-CFLAGS
	$(QUIET_CC)$(CC) -o scripts/perl/Perf-Trace-Util/Context.o -c $(ALL_CFLAGS) $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-nested-externs $<		$(QUIET_CC)$(CC) -o scripts/perl/Perf-Trace-Util/Context.o -c $(ALL_CFLAGS) $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-nested-externs $<
	@@ -1012,6 +1012,7 @@ install: all
	$(INSTALL) scripts/perl/Perf-Trace-Util/lib/Perf/Trace/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'		$(INSTALL) scripts/perl/Perf-Trace-Util/lib/Perf/Trace/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'
	$(INSTALL) scripts/perl/*.pl -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl'		$(INSTALL) scripts/perl/*.pl -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl'
	$(INSTALL) scripts/perl/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin'		$(INSTALL) scripts/perl/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin'

	ifdef BUILT_INS		ifdef BUILT_INS
	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
	$(INSTALL) $(BUILT_INS) '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'		$(INSTALL) $(BUILT_INS) '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'

tools/perf/util/trace-event-perl.c→tools/perf/util/scripting-engines/trace-event-perl.c

+11 −77

Original line number	Original line	Diff line number	Diff line
	@@ -25,10 +25,16 @@
	#include <ctype.h>		#include <ctype.h>
	#include <errno.h>		#include <errno.h>

	#include "../perf.h"		#include "../../perf.h"
	#include "util.h"		#include "../util.h"
	#include "trace-event.h"		#include "../trace-event.h"
	#include "trace-event-perl.h"
			#include <EXTERN.h>
			#include <perl.h>

			void boot_Perf__Trace__Context(pTHX_ CV *cv);
			void boot_DynaLoader(pTHX_ CV *cv);
			typedef PerlInterpreter * INTERP;

	void xs_init(pTHX);		void xs_init(pTHX);

	@@ -49,7 +55,7 @@ INTERP my_perl;

	struct event *events[FTRACE_MAX_EVENT];		struct event *events[FTRACE_MAX_EVENT];

	static struct scripting_context *scripting_context;		extern struct scripting_context *scripting_context;

	static char *cur_field_name;		static char *cur_field_name;
	static int zero_flag_atom;		static int zero_flag_atom;
	@@ -560,75 +566,3 @@ struct scripting_ops perl_scripting_ops = {
	.process_event = perl_process_event,		.process_event = perl_process_event,
	.generate_script = perl_generate_script,		.generate_script = perl_generate_script,
	};		};

	static void print_unsupported_msg(void)
	{
	fprintf(stderr, "Perl scripting not supported."
	" Install libperl and rebuild perf to enable it.\n"
	"For example:\n # apt-get install libperl-dev (ubuntu)"
	"\n # yum install perl-ExtUtils-Embed (Fedora)"
	"\n etc.\n");
	}

	static int perl_start_script_unsupported(const char *script __unused,
	int argc __unused,
	const char **argv __unused)
	{
	print_unsupported_msg();

	return -1;
	}

	static int perl_stop_script_unsupported(void)
	{
	return 0;
	}

	static void perl_process_event_unsupported(int cpu __unused,
	void *data __unused,
	int size __unused,
	unsigned long long nsecs __unused,
	char *comm __unused)
	{
	}

	static int perl_generate_script_unsupported(const char *outfile __unused)
	{
	print_unsupported_msg();

	return -1;
	}

	struct scripting_ops perl_scripting_unsupported_ops = {
	.name = "Perl",
	.start_script = perl_start_script_unsupported,
	.stop_script = perl_stop_script_unsupported,
	.process_event = perl_process_event_unsupported,
	.generate_script = perl_generate_script_unsupported,
	};

	static void register_perl_scripting(struct scripting_ops *scripting_ops)
	{
	int err;
	err = script_spec_register("Perl", scripting_ops);
	if (err)
	die("error registering Perl script extension");

	err = script_spec_register("pl", scripting_ops);
	if (err)
	die("error registering pl script extension");

	scripting_context = malloc(sizeof(struct scripting_context));
	}

	#ifdef NO_LIBPERL
	void setup_perl_scripting(void)
	{
	register_perl_scripting(&perl_scripting_unsupported_ops);
	}
	#else
	void setup_perl_scripting(void)
	{
	register_perl_scripting(&perl_scripting_ops);
	}
	#endif

tools/perf/util/trace-event-perl.h

deleted100644 → 0

+0 −47

Original line number	Original line	Diff line number	Diff line
	#ifndef __PERF_TRACE_EVENT_PERL_H
	#define __PERF_TRACE_EVENT_PERL_H
	#ifdef NO_LIBPERL
	typedef int INTERP;
	#define dSP
	#define ENTER
	#define SAVETMPS
	#define PUTBACK
	#define SPAGAIN
	#define FREETMPS
	#define LEAVE
	#define SP
	#define ERRSV
	#define G_SCALAR (0)
	#define G_DISCARD (0)
	#define G_NOARGS (0)
	#define PUSHMARK(a)
	#define SvTRUE(a) (0)
	#define XPUSHs(s)
	#define sv_2mortal(a)
	#define newSVpv(a,b)
	#define newSVuv(a)
	#define newSViv(a)
	#define get_cv(a,b) (0)
	#define call_pv(a,b) (0)
	#define perl_alloc() (0)
	#define perl_construct(a) (0)
	#define perl_parse(a,b,c,d,e) (0)
	#define perl_run(a) (0)
	#define perl_destruct(a) (0)
	#define perl_free(a) (0)
	#define pTHX void
	#define CV void
	#define dXSUB_SYS
	#define pTHX_
	static inline void newXS(const char a, void b, const char *c) {}
	static void boot_Perf__Trace__Context(pTHX_ CV *cv) {}
	static void boot_DynaLoader(pTHX_ CV *cv) {}
	#else
	#include <EXTERN.h>
	#include <perl.h>
	void boot_Perf__Trace__Context(pTHX_ CV *cv);
	void boot_DynaLoader(pTHX_ CV *cv);
	typedef PerlInterpreter * INTERP;
	#endif

	#endif /* __PERF_TRACE_EVENT_PERL_H */

tools/perf/util/trace-event-scripting.c

0 → 100644

+106 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* trace-event-scripting. Scripting engine common and initialization code.
			*
			* Copyright (C) 2009-2010 Tom Zanussi <tzanussi@gmail.com>
			*
			* This program is free software; you can redistribute it and/or modify
			* it under the terms of the GNU General Public License as published by
			* the Free Software Foundation; either version 2 of the License, or
			* (at your option) any later version.
			*
			* This program is distributed in the hope that it will be useful,
			* but WITHOUT ANY WARRANTY; without even the implied warranty of
			* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
			* GNU General Public License for more details.
			*
			* You should have received a copy of the GNU General Public License
			* along with this program; if not, write to the Free Software
			* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
			*
			*/

			#include <stdio.h>
			#include <stdlib.h>
			#include <string.h>
			#include <ctype.h>
			#include <errno.h>

			#include "../perf.h"
			#include "util.h"
			#include "trace-event.h"

			struct scripting_context *scripting_context;

			static int stop_script_unsupported(void)
			{
			return 0;
			}

			static void process_event_unsupported(int cpu __unused,
			void *data __unused,
			int size __unused,
			unsigned long long nsecs __unused,
			char *comm __unused)
			{
			}

			static void print_perl_unsupported_msg(void)
			{
			fprintf(stderr, "Perl scripting not supported."
			" Install libperl and rebuild perf to enable it.\n"
			"For example:\n # apt-get install libperl-dev (ubuntu)"
			"\n # yum install 'perl(ExtUtils::Embed)' (Fedora)"
			"\n etc.\n");
			}

			static int perl_start_script_unsupported(const char *script __unused,
			int argc __unused,
			const char **argv __unused)
			{
			print_perl_unsupported_msg();

			return -1;
			}

			static int perl_generate_script_unsupported(const char *outfile __unused)
			{
			print_perl_unsupported_msg();

			return -1;
			}

			struct scripting_ops perl_scripting_unsupported_ops = {
			.name = "Perl",
			.start_script = perl_start_script_unsupported,
			.stop_script = stop_script_unsupported,
			.process_event = process_event_unsupported,
			.generate_script = perl_generate_script_unsupported,
			};

			static void register_perl_scripting(struct scripting_ops *scripting_ops)
			{
			int err;
			err = script_spec_register("Perl", scripting_ops);
			if (err)
			die("error registering Perl script extension");

			err = script_spec_register("pl", scripting_ops);
			if (err)
			die("error registering pl script extension");

			scripting_context = malloc(sizeof(struct scripting_context));
			}

			#ifdef NO_LIBPERL
			void setup_perl_scripting(void)
			{
			register_perl_scripting(&perl_scripting_unsupported_ops);
			}
			#else
			struct scripting_ops perl_scripting_ops;

			void setup_perl_scripting(void)
			{
			register_perl_scripting(&perl_scripting_ops);
			}
			#endif