aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-script.c
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2011-12-07 04:02:54 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2011-12-23 14:01:03 -0500
commitefad14150a0b4429f37da7245001a8096ef7ee38 (patch)
tree61c41a83384266dca00a2a4c88f43ebf4bdf5b5e /tools/perf/builtin-script.c
parent1b5495043d5bc058def21f9b66fd8feaa794eb44 (diff)
perf report: Accept fifos as input file
The default input file for perf report is not handled the same way as perf record does it for its output file. This leads to unexpected behavior of perf report, etc. E.g.: # perf record -a -e cpu-cycles sleep 2 | perf report | cat failed to open perf.data: No such file or directory (try 'perf record' first) While perf record writes to a fifo, perf report expects perf.data to be read. This patch changes this to accept fifos as input file. Applies to the following commands: perf annotate perf buildid-list perf evlist perf kmem perf lock perf report perf sched perf script perf timechart Also fixes char const* -> const char* type declaration for filename strings. v2: * Prevent potential null pointer access to input_name in builtin-report.c. Needed due to removal of patch "perf report: Setup browser if stdout is a pipe" Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1323248577-11268-5-git-send-email-robert.richter@amd.com Signed-off-by: Robert Richter <robert.richter@amd.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-script.c')
-rw-r--r--tools/perf/builtin-script.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index d71b745da06e..3d4c0c7b576e 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -434,7 +434,7 @@ static int cleanup_scripting(void)
434 return scripting_ops->stop_script(); 434 return scripting_ops->stop_script();
435} 435}
436 436
437static char const *input_name = "perf.data"; 437static const char *input_name;
438 438
439static int process_sample_event(struct perf_tool *tool __used, 439static int process_sample_event(struct perf_tool *tool __used,
440 union perf_event *event, 440 union perf_event *event,
@@ -1316,7 +1316,7 @@ int cmd_script(int argc, const char **argv, const char *prefix __used)
1316 return -1; 1316 return -1;
1317 } 1317 }
1318 1318
1319 input = open(input_name, O_RDONLY); 1319 input = open(session->filename, O_RDONLY); /* input_name */
1320 if (input < 0) { 1320 if (input < 0) {
1321 perror("failed to open file"); 1321 perror("failed to open file");
1322 exit(-1); 1322 exit(-1);