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>
79 lines
2.1 KiB
C
79 lines
2.1 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Builtin evlist command: Show the list of event selectors present
|
|
* in a perf.data file.
|
|
*/
|
|
#include "builtin.h"
|
|
|
|
#include <linux/list.h>
|
|
|
|
#include "perf.h"
|
|
#include "util/evlist.h"
|
|
#include "util/evsel.h"
|
|
#include "util/parse-events.h"
|
|
#include <subcmd/parse-options.h>
|
|
#include "util/session.h"
|
|
#include "util/data.h"
|
|
#include "util/debug.h"
|
|
#include <linux/err.h>
|
|
|
|
static int __cmd_evlist(const char *file_name, struct perf_attr_details *details)
|
|
{
|
|
struct perf_session *session;
|
|
struct evsel *pos;
|
|
struct perf_data data = {
|
|
.path = file_name,
|
|
.mode = PERF_DATA_MODE_READ,
|
|
.force = details->force,
|
|
};
|
|
bool has_tracepoint = false;
|
|
|
|
session = perf_session__new(&data, 0, NULL);
|
|
if (IS_ERR(session))
|
|
return PTR_ERR(session);
|
|
|
|
evlist__for_each_entry(session->evlist, pos) {
|
|
perf_evsel__fprintf(pos, details, stdout);
|
|
|
|
if (pos->core.attr.type == PERF_TYPE_TRACEPOINT)
|
|
has_tracepoint = true;
|
|
}
|
|
|
|
if (has_tracepoint && !details->trace_fields)
|
|
printf("# Tip: use 'perf evlist --trace-fields' to show fields for tracepoint events\n");
|
|
|
|
perf_session__delete(session);
|
|
return 0;
|
|
}
|
|
|
|
int cmd_evlist(int argc, const char **argv)
|
|
{
|
|
struct perf_attr_details details = { .verbose = false, };
|
|
const struct option options[] = {
|
|
OPT_STRING('i', "input", &input_name, "file", "Input file name"),
|
|
OPT_BOOLEAN('F', "freq", &details.freq, "Show the sample frequency"),
|
|
OPT_BOOLEAN('v', "verbose", &details.verbose,
|
|
"Show all event attr details"),
|
|
OPT_BOOLEAN('g', "group", &details.event_group,
|
|
"Show event group information"),
|
|
OPT_BOOLEAN('f', "force", &details.force, "don't complain, do it"),
|
|
OPT_BOOLEAN(0, "trace-fields", &details.trace_fields, "Show tracepoint fields"),
|
|
OPT_END()
|
|
};
|
|
const char * const evlist_usage[] = {
|
|
"perf evlist [<options>]",
|
|
NULL
|
|
};
|
|
|
|
argc = parse_options(argc, argv, options, evlist_usage, 0);
|
|
if (argc)
|
|
usage_with_options(evlist_usage, options);
|
|
|
|
if (details.event_group && (details.verbose || details.freq)) {
|
|
usage_with_options_msg(evlist_usage, options,
|
|
"--group option is not compatible with other options\n");
|
|
}
|
|
|
|
return __cmd_evlist(input_name, &details);
|
|
}
|