mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
perf buildid-list: Don't use globals where not needed to
Some variables were global but used in just one function, so move it to where it belongs. Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Namhyung Kim <namhyung@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/n/tip-ixb32cbcka9w1fk07xrksusf@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
472cc83c32
commit
6ee4149736
1 changed files with 24 additions and 31 deletions
|
@ -16,27 +16,6 @@
|
||||||
#include "util/session.h"
|
#include "util/session.h"
|
||||||
#include "util/symbol.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)
|
static int sysfs__fprintf_build_id(FILE *fp)
|
||||||
{
|
{
|
||||||
u8 kallsyms_build_id[BUILD_ID_SIZE];
|
u8 kallsyms_build_id[BUILD_ID_SIZE];
|
||||||
|
@ -65,7 +44,8 @@ static int filename__fprintf_build_id(const char *name, FILE *fp)
|
||||||
return fprintf(fp, "%s\n", sbuild_id);
|
return fprintf(fp, "%s\n", sbuild_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int perf_session__list_build_ids(void)
|
static int perf_session__list_build_ids(const char *input_name,
|
||||||
|
bool force, bool with_hits)
|
||||||
{
|
{
|
||||||
struct perf_session *session;
|
struct perf_session *session;
|
||||||
|
|
||||||
|
@ -95,18 +75,31 @@ static int perf_session__list_build_ids(void)
|
||||||
return 0;
|
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,
|
int cmd_buildid_list(int argc, const char **argv,
|
||||||
const char *prefix __maybe_unused)
|
const char *prefix __maybe_unused)
|
||||||
{
|
{
|
||||||
|
bool show_kernel = false;
|
||||||
|
bool with_hits = false;
|
||||||
|
bool force = false;
|
||||||
|
const char *input_name = NULL;
|
||||||
|
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()
|
||||||
|
};
|
||||||
|
const char * const buildid_list_usage[] = {
|
||||||
|
"perf buildid-list [<options>]",
|
||||||
|
NULL
|
||||||
|
};
|
||||||
|
|
||||||
argc = parse_options(argc, argv, options, buildid_list_usage, 0);
|
argc = parse_options(argc, argv, options, buildid_list_usage, 0);
|
||||||
setup_pager();
|
setup_pager();
|
||||||
return __cmd_buildid_list();
|
|
||||||
|
if (show_kernel)
|
||||||
|
return sysfs__fprintf_build_id(stdout);
|
||||||
|
|
||||||
|
return perf_session__list_build_ids(input_name, force, with_hits);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue