efad14150a
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>
110 lines
2.6 KiB
C
110 lines
2.6 KiB
C
/*
|
|
* builtin-buildid-list.c
|
|
*
|
|
* Builtin buildid-list command: list buildids in perf.data, in the running
|
|
* kernel and in ELF files.
|
|
*
|
|
* Copyright (C) 2009, Red Hat Inc.
|
|
* Copyright (C) 2009, Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
*/
|
|
#include "builtin.h"
|
|
#include "perf.h"
|
|
#include "util/build-id.h"
|
|
#include "util/cache.h"
|
|
#include "util/debug.h"
|
|
#include "util/parse-options.h"
|
|
#include "util/session.h"
|
|
#include "util/symbol.h"
|
|
|
|
#include <libelf.h>
|
|
|
|
static const char *input_name;
|
|
static bool force;
|
|
static bool show_kernel;
|
|
static bool with_hits;
|
|
|
|
static const char * const buildid_list_usage[] = {
|
|
"perf buildid-list [<options>]",
|
|
NULL
|
|
};
|
|
|
|
static const struct option options[] = {
|
|
OPT_BOOLEAN('H', "with-hits", &with_hits, "Show only DSOs with hits"),
|
|
OPT_STRING('i', "input", &input_name, "file",
|
|
"input file name"),
|
|
OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
|
|
OPT_BOOLEAN('k', "kernel", &show_kernel, "Show current kernel build id"),
|
|
OPT_INCR('v', "verbose", &verbose,
|
|
"be more verbose"),
|
|
OPT_END()
|
|
};
|
|
|
|
static int sysfs__fprintf_build_id(FILE *fp)
|
|
{
|
|
u8 kallsyms_build_id[BUILD_ID_SIZE];
|
|
char sbuild_id[BUILD_ID_SIZE * 2 + 1];
|
|
|
|
if (sysfs__read_build_id("/sys/kernel/notes", kallsyms_build_id,
|
|
sizeof(kallsyms_build_id)) != 0)
|
|
return -1;
|
|
|
|
build_id__sprintf(kallsyms_build_id, sizeof(kallsyms_build_id),
|
|
sbuild_id);
|
|
fprintf(fp, "%s\n", sbuild_id);
|
|
return 0;
|
|
}
|
|
|
|
static int filename__fprintf_build_id(const char *name, FILE *fp)
|
|
{
|
|
u8 build_id[BUILD_ID_SIZE];
|
|
char sbuild_id[BUILD_ID_SIZE * 2 + 1];
|
|
|
|
if (filename__read_build_id(name, build_id,
|
|
sizeof(build_id)) != sizeof(build_id))
|
|
return 0;
|
|
|
|
build_id__sprintf(build_id, sizeof(build_id), sbuild_id);
|
|
return fprintf(fp, "%s\n", sbuild_id);
|
|
}
|
|
|
|
static int perf_session__list_build_ids(void)
|
|
{
|
|
struct perf_session *session;
|
|
|
|
elf_version(EV_CURRENT);
|
|
|
|
session = perf_session__new(input_name, O_RDONLY, force, false,
|
|
&build_id__mark_dso_hit_ops);
|
|
if (session == NULL)
|
|
return -1;
|
|
|
|
/*
|
|
* See if this is an ELF file first:
|
|
*/
|
|
if (filename__fprintf_build_id(session->filename, stdout))
|
|
goto out;
|
|
|
|
if (with_hits)
|
|
perf_session__process_events(session, &build_id__mark_dso_hit_ops);
|
|
|
|
perf_session__fprintf_dsos_buildid(session, stdout, with_hits);
|
|
out:
|
|
perf_session__delete(session);
|
|
return 0;
|
|
}
|
|
|
|
static int __cmd_buildid_list(void)
|
|
{
|
|
if (show_kernel)
|
|
return sysfs__fprintf_build_id(stdout);
|
|
|
|
return perf_session__list_build_ids();
|
|
}
|
|
|
|
int cmd_buildid_list(int argc, const char **argv, const char *prefix __used)
|
|
{
|
|
argc = parse_options(argc, argv, options, buildid_list_usage, 0);
|
|
setup_pager();
|
|
return __cmd_buildid_list();
|
|
}
|