1d037ca164
perf defines both __used and __unused variables to use for marking
unused variables. The variable __used is defined to
__attribute__((__unused__)), which contradicts the kernel definition to
__attribute__((__used__)) for new gcc versions. On Android, __used is
also defined in system headers and this leads to warnings like: warning:
'__used__' attribute ignored
__unused is not defined in the kernel and is not a standard definition.
If __unused is included everywhere instead of __used, this leads to
conflicts with glibc headers, since glibc has a variables with this name
in its headers.
The best approach is to use __maybe_unused, the definition used in the
kernel for __attribute__((unused)). In this way there is only one
definition in perf sources (instead of 2 definitions that point to the
same thing: __used and __unused) and it works on both Linux and Android.
This patch simply replaces all instances of __used and __unused with
__maybe_unused.
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1347315303-29906-7-git-send-email-irina.tirdea@intel.com
[ committer note: fixed up conflict with a116e05
in builtin-sched.c ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
112 lines
2.8 KiB
C
112 lines
2.8 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"
|
|
|
|
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;
|
|
|
|
symbol__elf_init();
|
|
|
|
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;
|
|
|
|
/*
|
|
* in pipe-mode, the only way to get the buildids is to parse
|
|
* the record stream. Buildids are stored as RECORD_HEADER_BUILD_ID
|
|
*/
|
|
if (with_hits || session->fd_pipe)
|
|
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 __maybe_unused)
|
|
{
|
|
argc = parse_options(argc, argv, options, buildid_list_usage, 0);
|
|
setup_pager();
|
|
return __cmd_buildid_list();
|
|
}
|