mirror of
https://github.com/torvalds/linux.git
synced 2024-11-14 16:12:02 +00:00
1fc632cef4
Move the perf_event_attr struct fron 'struct evsel' to 'struct perf_evsel'.
Committer notes:
Fixed up these:
tools/perf/arch/arm/util/auxtrace.c
tools/perf/arch/arm/util/cs-etm.c
tools/perf/arch/arm64/util/arm-spe.c
tools/perf/arch/s390/util/auxtrace.c
tools/perf/util/cs-etm.c
Also
cc1: warnings being treated as errors
tests/sample-parsing.c: In function 'do_test':
tests/sample-parsing.c:162: error: missing initializer
tests/sample-parsing.c:162: error: (near initialization for 'evsel.core.cpus')
struct evsel evsel = {
.needs_swap = false,
- .core.attr = {
- .sample_type = sample_type,
- .read_format = read_format,
+ .core = {
+ . attr = {
+ .sample_type = sample_type,
+ .read_format = read_format,
+ },
[perfbuilder@a70e4eeb5549 /]$ gcc --version |& head -1
gcc (GCC) 4.4.7
Also we don't need to include perf_event.h in
tools/perf/lib/include/perf/evsel.h, forward declaring 'struct
perf_event_attr' is enough. And this even fixes the build in some
systems where things are used somewhere down the include path from
perf_event.h without defining __always_inline.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190721112506.12306-43-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
80 lines
2.1 KiB
C
80 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 "util/util.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"
|
|
|
|
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 (session == NULL)
|
|
return -1;
|
|
|
|
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);
|
|
}
|