git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
perf trace: Fix detection of script extension
[pandora-kernel.git]
/
tools
/
perf
/
builtin-trace.c
diff --git
a/tools/perf/builtin-trace.c
b/tools/perf/builtin-trace.c
index
294da72
..
deda1a9
100644
(file)
--- a/
tools/perf/builtin-trace.c
+++ b/
tools/perf/builtin-trace.c
@@
-1,13
+1,16
@@
#include "builtin.h"
#include "builtin.h"
-#include "
util/util
.h"
+#include "
perf
.h"
#include "util/cache.h"
#include "util/cache.h"
+#include "util/debug.h"
+#include "util/exec_cmd.h"
+#include "util/header.h"
+#include "util/parse-options.h"
+#include "util/session.h"
#include "util/symbol.h"
#include "util/thread.h"
#include "util/symbol.h"
#include "util/thread.h"
-#include "util/header.h"
-#include "util/exec_cmd.h"
#include "util/trace-event.h"
#include "util/trace-event.h"
-#include "util/
session
.h"
+#include "util/
util
.h"
static char const *script_name;
static char const *generate_script_lang;
static char const *script_name;
static char const *generate_script_lang;
@@
-43,9
+46,6
@@
static struct scripting_ops *scripting_ops;
static void setup_scripting(void)
{
static void setup_scripting(void)
{
- /* make sure PERF_EXEC_PATH is set for scripts */
- perf_set_argv_exec_path(perf_exec_path());
-
setup_perl_scripting();
setup_python_scripting();
setup_perl_scripting();
setup_python_scripting();
@@
-59,14
+59,6
@@
static int cleanup_scripting(void)
return scripting_ops->stop_script();
}
return scripting_ops->stop_script();
}
-#include "util/parse-options.h"
-
-#include "perf.h"
-#include "util/debug.h"
-
-#include "util/trace-event.h"
-#include "util/exec_cmd.h"
-
static char const *input_name = "perf.data";
static int process_sample_event(event_t *event, struct perf_session *session)
static char const *input_name = "perf.data";
static int process_sample_event(event_t *event, struct perf_session *session)
@@
-290,7
+282,7
@@
static int parse_scriptname(const struct option *opt __used,
script++;
} else {
script = str;
script++;
} else {
script = str;
- ext = strchr(script, '.');
+ ext = str
r
chr(script, '.');
if (!ext) {
fprintf(stderr, "invalid script extension");
return -1;
if (!ext) {
fprintf(stderr, "invalid script extension");
return -1;
@@
-598,6
+590,9
@@
int cmd_trace(int argc, const char **argv, const char *prefix __used)
suffix = REPORT_SUFFIX;
}
suffix = REPORT_SUFFIX;
}
+ /* make sure PERF_EXEC_PATH is set for scripts */
+ perf_set_argv_exec_path(perf_exec_path());
+
if (!suffix && argc >= 2 && strncmp(argv[1], "-", strlen("-")) != 0) {
char *record_script_path, *report_script_path;
int live_pipe[2];
if (!suffix && argc >= 2 && strncmp(argv[1], "-", strlen("-")) != 0) {
char *record_script_path, *report_script_path;
int live_pipe[2];