From 42de3193b8a0732fc6fc7b08f2d2d15e37b86e8e Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tzanussi@gmail.com>
Date: Sun, 6 Dec 2009 23:31:59 -0600
Subject: [PATCH] --- yaml --- r: 175407 b: refs/heads/master c:
 67a6259ec97b8408f86f2fe8459d2233f0b0987d h: refs/heads/master i:   175405:
 ec0ee01de60823e1eba61bf47d4be12625b277cb   175403:
 af99810b605463a8166c2cba6d4058a2979baeae   175399:
 9e30c34fac472e7e8d45b727ee1b6909d15bad8b   175391:
 82648f9a2526b502ba4675cb1f7e6e30058e9fbd v: v3

---
 [refs]                                   |  2 +-
 trunk/tools/perf/util/trace-event-perl.c | 64 ++++++++++++++++++++----
 2 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 990c928e1047..17f7591f6626 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11a80ddbf3521c428bcde2d31e6632cef186bae9
+refs/heads/master: 67a6259ec97b8408f86f2fe8459d2233f0b0987d
diff --git a/trunk/tools/perf/util/trace-event-perl.c b/trunk/tools/perf/util/trace-event-perl.c
index 59564b22d9ce..a5ffe60db5d6 100644
--- a/trunk/tools/perf/util/trace-event-perl.c
+++ b/trunk/tools/perf/util/trace-event-perl.c
@@ -570,26 +570,72 @@ struct scripting_ops perl_scripting_ops = {
 	.generate_script = perl_generate_script,
 };
 
-#ifdef NO_LIBPERL
-void setup_perl_scripting(void)
+static void print_unsupported_msg(void)
 {
 	fprintf(stderr, "Perl scripting not supported."
-		"  Install libperl and rebuild perf to enable it.  e.g. "
-		"apt-get install libperl-dev (ubuntu), yum install "
-		"perl-ExtUtils-Embed (Fedora), etc.\n");
+		"  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");
 }
-#else
-void setup_perl_scripting(void)
+
+static int perl_start_script_unsupported(const char *script __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", &perl_scripting_ops);
+	err = script_spec_register("Perl", scripting_ops);
 	if (err)
 		die("error registering Perl script extension");
 
-	err = script_spec_register("pl", &perl_scripting_ops);
+	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