![Ian Munsie](/assets/img/avatar_default.png)
Parsing an option from the command line with OPT_BOOLEAN on a bool data type would not work on a big-endian machine due to the manner in which the boolean was being cast into an int and incremented. For example, running 'perf probe --list' on a PowerPC machine would fail to properly set the list_events bool and would therefore print out the usage information and terminate. This patch makes OPT_BOOLEAN work as expected with a bool datatype. For cases where the original OPT_BOOLEAN was intentionally being used to increment an int each time it was passed in on the command line, this patch introduces OPT_INCR with the old behaviour of OPT_BOOLEAN (the verbose variable is currently the only such example of this). I have reviewed every use of OPT_BOOLEAN to verify that a true C99 bool was passed. Where integers were used, I verified that they were only being used for boolean logic and changed them to bools to ensure that they would not be mistakenly used as ints. The major exception was the verbose variable which now uses OPT_INCR instead of OPT_BOOLEAN. Signed-off-by: Ian Munsie <imunsie@au.ibm.com> Acked-by: David S. Miller <davem@davemloft.net> Cc: <stable@kernel.org> # NOTE: wont apply to .3[34].x cleanly, please backport Cc: Git development list <git@vger.kernel.org> Cc: Ian Munsie <imunsie@au1.ibm.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Eric B Munson <ebmunson@us.ibm.com> Cc: Valdis.Kletnieks@vt.edu Cc: WANG Cong <amwang@redhat.com> Cc: Thiago Farina <tfransosi@gmail.com> Cc: Masami Hiramatsu <mhiramat@redhat.com> Cc: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> Cc: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> Cc: Arjan van de Ven <arjan@linux.intel.com> Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Cc: Mike Galbraith <efault@gmx.de> Cc: Tom Zanussi <tzanussi@gmail.com> Cc: Anton Blanchard <anton@samba.org> Cc: John Kacur <jkacur@redhat.com> Cc: Li Zefan <lizf@cn.fujitsu.com> Cc: Steven Rostedt <rostedt@goodmis.org> LKML-Reference: <1271147857-11604-1-git-send-email-imunsie@au.ibm.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
134 lines
3.2 KiB
C
134 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);
|
|
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 __used,
|
|
const char *debugdir __used)
|
|
{
|
|
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/%s", getenv("HOME"),
|
|
DEBUG_CACHE_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 __used)
|
|
{
|
|
argc = parse_options(argc, argv, buildid_cache_options,
|
|
buildid_cache_usage, 0);
|
|
|
|
if (symbol__init() < 0)
|
|
return -1;
|
|
|
|
setup_pager();
|
|
return __cmd_buildid_cache();
|
|
}
|