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>
135 lines
3.2 KiB
C
135 lines
3.2 KiB
C
/*
|
|
* builtin-buildid-cache.c
|
|
*
|
|
* Builtin buildid-cache command: Manages build-id cache
|
|
*
|
|
* Copyright (C) 2010, Red Hat Inc.
|
|
* Copyright (C) 2010, Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
*/
|
|
#include "builtin.h"
|
|
#include "perf.h"
|
|
#include "util/cache.h"
|
|
#include "util/debug.h"
|
|
#include "util/header.h"
|
|
#include "util/parse-options.h"
|
|
#include "util/strlist.h"
|
|
#include "util/symbol.h"
|
|
|
|
static char const *add_name_list_str, *remove_name_list_str;
|
|
|
|
static const char * const buildid_cache_usage[] = {
|
|
"perf buildid-cache [<options>]",
|
|
NULL
|
|
};
|
|
|
|
static const struct option buildid_cache_options[] = {
|
|
OPT_STRING('a', "add", &add_name_list_str,
|
|
"file list", "file(s) to add"),
|
|
OPT_STRING('r', "remove", &remove_name_list_str, "file list",
|
|
"file(s) to remove"),
|
|
OPT_INCR('v', "verbose", &verbose, "be more verbose"),
|
|
OPT_END()
|
|
};
|
|
|
|
static int build_id_cache__add_file(const char *filename, const char *debugdir)
|
|
{
|
|
char sbuild_id[BUILD_ID_SIZE * 2 + 1];
|
|
u8 build_id[BUILD_ID_SIZE];
|
|
int err;
|
|
|
|
if (filename__read_build_id(filename, &build_id, sizeof(build_id)) < 0) {
|
|
pr_debug("Couldn't read a build-id in %s\n", filename);
|
|
return -1;
|
|
}
|
|
|
|
build_id__sprintf(build_id, sizeof(build_id), sbuild_id);
|
|
err = build_id_cache__add_s(sbuild_id, debugdir, filename,
|
|
false, false);
|
|
if (verbose)
|
|
pr_info("Adding %s %s: %s\n", sbuild_id, filename,
|
|
err ? "FAIL" : "Ok");
|
|
return err;
|
|
}
|
|
|
|
static int build_id_cache__remove_file(const char *filename __maybe_unused,
|
|
const char *debugdir __maybe_unused)
|
|
{
|
|
u8 build_id[BUILD_ID_SIZE];
|
|
char sbuild_id[BUILD_ID_SIZE * 2 + 1];
|
|
|
|
int err;
|
|
|
|
if (filename__read_build_id(filename, &build_id, sizeof(build_id)) < 0) {
|
|
pr_debug("Couldn't read a build-id in %s\n", filename);
|
|
return -1;
|
|
}
|
|
|
|
build_id__sprintf(build_id, sizeof(build_id), sbuild_id);
|
|
err = build_id_cache__remove_s(sbuild_id, debugdir);
|
|
if (verbose)
|
|
pr_info("Removing %s %s: %s\n", sbuild_id, filename,
|
|
err ? "FAIL" : "Ok");
|
|
|
|
return err;
|
|
}
|
|
|
|
static int __cmd_buildid_cache(void)
|
|
{
|
|
struct strlist *list;
|
|
struct str_node *pos;
|
|
char debugdir[PATH_MAX];
|
|
|
|
snprintf(debugdir, sizeof(debugdir), "%s", buildid_dir);
|
|
|
|
if (add_name_list_str) {
|
|
list = strlist__new(true, add_name_list_str);
|
|
if (list) {
|
|
strlist__for_each(pos, list)
|
|
if (build_id_cache__add_file(pos->s, debugdir)) {
|
|
if (errno == EEXIST) {
|
|
pr_debug("%s already in the cache\n",
|
|
pos->s);
|
|
continue;
|
|
}
|
|
pr_warning("Couldn't add %s: %s\n",
|
|
pos->s, strerror(errno));
|
|
}
|
|
|
|
strlist__delete(list);
|
|
}
|
|
}
|
|
|
|
if (remove_name_list_str) {
|
|
list = strlist__new(true, remove_name_list_str);
|
|
if (list) {
|
|
strlist__for_each(pos, list)
|
|
if (build_id_cache__remove_file(pos->s, debugdir)) {
|
|
if (errno == ENOENT) {
|
|
pr_debug("%s wasn't in the cache\n",
|
|
pos->s);
|
|
continue;
|
|
}
|
|
pr_warning("Couldn't remove %s: %s\n",
|
|
pos->s, strerror(errno));
|
|
}
|
|
|
|
strlist__delete(list);
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int cmd_buildid_cache(int argc, const char **argv,
|
|
const char *prefix __maybe_unused)
|
|
{
|
|
argc = parse_options(argc, argv, buildid_cache_options,
|
|
buildid_cache_usage, 0);
|
|
|
|
if (symbol__init() < 0)
|
|
return -1;
|
|
|
|
setup_pager();
|
|
return __cmd_buildid_cache();
|
|
}
|