mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 08:58:07 +00:00
6ef81c55a2
This patch is to return error code of perf_new_session function on failure instead of NULL. Test Results: Before Fix: $ perf c2c report -input failed to open nput: No such file or directory $ echo $? 0 $ After Fix: $ perf c2c report -input failed to open nput: No such file or directory $ echo $? 254 $ Committer notes: Fix 'perf tests topology' case, where we use that TEST_ASSERT_VAL(..., session), i.e. we need to pass zero in case of failure, which was the case before when NULL was returned by perf_session__new() for failure, but now we need to negate the result of IS_ERR(session) to respect that TEST_ASSERT_VAL) expectation of zero meaning failure. Reported-by: Nageswara R Sastry <rnsastry@linux.vnet.ibm.com> Signed-off-by: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Tested-by: Nageswara R Sastry <rnsastry@linux.vnet.ibm.com> Acked-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com> Reviewed-by: Jiri Olsa <jolsa@redhat.com> Reviewed-by: Mukesh Ojha <mojha@codeaurora.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Alexey Budankov <alexey.budankov@linux.intel.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Jeremie Galarneau <jeremie.galarneau@efficios.com> Cc: Kate Stewart <kstewart@linuxfoundation.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Shawn Landden <shawn@git.icu> Cc: Song Liu <songliubraving@fb.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tzvetomir Stoyanov <tstoyanov@vmware.com> Link: http://lore.kernel.org/lkml/20190822071223.17892.45782.stgit@localhost.localdomain Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
118 lines
3 KiB
C
118 lines
3 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/debug.h"
|
|
#include "util/dso.h"
|
|
#include <subcmd/pager.h>
|
|
#include <subcmd/parse-options.h>
|
|
#include "util/session.h"
|
|
#include "util/symbol.h"
|
|
#include "util/data.h"
|
|
#include <errno.h>
|
|
#include <linux/err.h>
|
|
|
|
static int sysfs__fprintf_build_id(FILE *fp)
|
|
{
|
|
char sbuild_id[SBUILD_ID_SIZE];
|
|
int ret;
|
|
|
|
ret = sysfs__sprintf_build_id("/", sbuild_id);
|
|
if (ret != sizeof(sbuild_id))
|
|
return ret < 0 ? ret : -EINVAL;
|
|
|
|
return fprintf(fp, "%s\n", sbuild_id);
|
|
}
|
|
|
|
static int filename__fprintf_build_id(const char *name, FILE *fp)
|
|
{
|
|
char sbuild_id[SBUILD_ID_SIZE];
|
|
int ret;
|
|
|
|
ret = filename__sprintf_build_id(name, sbuild_id);
|
|
if (ret != sizeof(sbuild_id))
|
|
return ret < 0 ? ret : -EINVAL;
|
|
|
|
return fprintf(fp, "%s\n", sbuild_id);
|
|
}
|
|
|
|
static bool dso__skip_buildid(struct dso *dso, int with_hits)
|
|
{
|
|
return with_hits && !dso->hit;
|
|
}
|
|
|
|
static int perf_session__list_build_ids(bool force, bool with_hits)
|
|
{
|
|
struct perf_session *session;
|
|
struct perf_data data = {
|
|
.path = input_name,
|
|
.mode = PERF_DATA_MODE_READ,
|
|
.force = force,
|
|
};
|
|
|
|
symbol__elf_init();
|
|
/*
|
|
* See if this is an ELF file first:
|
|
*/
|
|
if (filename__fprintf_build_id(input_name, stdout) > 0)
|
|
goto out;
|
|
|
|
session = perf_session__new(&data, false, &build_id__mark_dso_hit_ops);
|
|
if (IS_ERR(session))
|
|
return PTR_ERR(session);
|
|
|
|
/*
|
|
* We take all buildids when the file contains AUX area tracing data
|
|
* because we do not decode the trace because it would take too long.
|
|
*/
|
|
if (!perf_data__is_pipe(&data) &&
|
|
perf_header__has_feat(&session->header, HEADER_AUXTRACE))
|
|
with_hits = false;
|
|
|
|
/*
|
|
* 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 || perf_data__is_pipe(&data))
|
|
perf_session__process_events(session);
|
|
|
|
perf_session__fprintf_dsos_buildid(session, stdout, dso__skip_buildid, with_hits);
|
|
perf_session__delete(session);
|
|
out:
|
|
return 0;
|
|
}
|
|
|
|
int cmd_buildid_list(int argc, const char **argv)
|
|
{
|
|
bool show_kernel = false;
|
|
bool with_hits = false;
|
|
bool force = false;
|
|
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);
|
|
setup_pager();
|
|
|
|
if (show_kernel)
|
|
return !(sysfs__fprintf_build_id(stdout) > 0);
|
|
|
|
return perf_session__list_build_ids(force, with_hits);
|
|
}
|