perf tools: Fix attributes for '{}' defined event groups
Fixing events attributes for groups defined via '{}'. Currently 'enable_on_exec' attribute in record command and both 'disabled ' and 'enable_on_exec' attributes in stat command are set based on the 'group' option. This eliminates proper setup for '{}' defined groups as they don't set 'group' option. Making above attributes values based on the 'evsel->leader' as this is common to both group definition. Moving perf_evlist__set_leader call within builtin-record ahead perf_evlist__config_attrs call, because the latter needs possible group leader links in place. Signed-off-by: Jiri Olsa <jolsa@redhat.com> Acked-by: Namhyung Kim <namhyung@kernel.org> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1352741644-16809-2-git-send-email-jolsa@redhat.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Родитель
6064803313
Коммит
cac2142557
|
@ -230,11 +230,15 @@ static int perf_record__open(struct perf_record *rec)
|
||||||
struct perf_record_opts *opts = &rec->opts;
|
struct perf_record_opts *opts = &rec->opts;
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
|
|
||||||
perf_evlist__config_attrs(evlist, opts);
|
/*
|
||||||
|
* Set the evsel leader links before we configure attributes,
|
||||||
|
* since some might depend on this info.
|
||||||
|
*/
|
||||||
if (opts->group)
|
if (opts->group)
|
||||||
perf_evlist__set_leader(evlist);
|
perf_evlist__set_leader(evlist);
|
||||||
|
|
||||||
|
perf_evlist__config_attrs(evlist, opts);
|
||||||
|
|
||||||
list_for_each_entry(pos, &evlist->entries, node) {
|
list_for_each_entry(pos, &evlist->entries, node) {
|
||||||
struct perf_event_attr *attr = &pos->attr;
|
struct perf_event_attr *attr = &pos->attr;
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -129,8 +129,7 @@ static struct stats runtime_itlb_cache_stats[MAX_NR_CPUS];
|
||||||
static struct stats runtime_dtlb_cache_stats[MAX_NR_CPUS];
|
static struct stats runtime_dtlb_cache_stats[MAX_NR_CPUS];
|
||||||
static struct stats walltime_nsecs_stats;
|
static struct stats walltime_nsecs_stats;
|
||||||
|
|
||||||
static int create_perf_stat_counter(struct perf_evsel *evsel,
|
static int create_perf_stat_counter(struct perf_evsel *evsel)
|
||||||
struct perf_evsel *first)
|
|
||||||
{
|
{
|
||||||
struct perf_event_attr *attr = &evsel->attr;
|
struct perf_event_attr *attr = &evsel->attr;
|
||||||
bool exclude_guest_missing = false;
|
bool exclude_guest_missing = false;
|
||||||
|
@ -153,7 +152,7 @@ retry:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!perf_target__has_task(&target) && (!group || evsel == first)) {
|
if (!perf_target__has_task(&target) && (!evsel->leader)) {
|
||||||
attr->disabled = 1;
|
attr->disabled = 1;
|
||||||
attr->enable_on_exec = 1;
|
attr->enable_on_exec = 1;
|
||||||
}
|
}
|
||||||
|
@ -272,7 +271,7 @@ static int read_counter(struct perf_evsel *counter)
|
||||||
static int __run_perf_stat(int argc __maybe_unused, const char **argv)
|
static int __run_perf_stat(int argc __maybe_unused, const char **argv)
|
||||||
{
|
{
|
||||||
unsigned long long t0, t1;
|
unsigned long long t0, t1;
|
||||||
struct perf_evsel *counter, *first;
|
struct perf_evsel *counter;
|
||||||
int status = 0;
|
int status = 0;
|
||||||
int child_ready_pipe[2], go_pipe[2];
|
int child_ready_pipe[2], go_pipe[2];
|
||||||
const bool forks = (argc > 0);
|
const bool forks = (argc > 0);
|
||||||
|
@ -332,10 +331,8 @@ static int __run_perf_stat(int argc __maybe_unused, const char **argv)
|
||||||
if (group)
|
if (group)
|
||||||
perf_evlist__set_leader(evsel_list);
|
perf_evlist__set_leader(evsel_list);
|
||||||
|
|
||||||
first = perf_evlist__first(evsel_list);
|
|
||||||
|
|
||||||
list_for_each_entry(counter, &evsel_list->entries, node) {
|
list_for_each_entry(counter, &evsel_list->entries, node) {
|
||||||
if (create_perf_stat_counter(counter, first) < 0) {
|
if (create_perf_stat_counter(counter) < 0) {
|
||||||
/*
|
/*
|
||||||
* PPC returns ENXIO for HW counters until 2.6.37
|
* PPC returns ENXIO for HW counters until 2.6.37
|
||||||
* (behavior changed with commit b0a873e).
|
* (behavior changed with commit b0a873e).
|
||||||
|
|
|
@ -15,6 +15,4 @@ config=1
|
||||||
sample_type=327
|
sample_type=327
|
||||||
mmap=0
|
mmap=0
|
||||||
comm=0
|
comm=0
|
||||||
# TODO this is disabled for --group option, enabled otherwise
|
enable_on_exec=0
|
||||||
# check why..
|
|
||||||
enable_on_exec=1
|
|
||||||
|
|
|
@ -11,7 +11,5 @@ group_fd=-1
|
||||||
fd=2
|
fd=2
|
||||||
group_fd=1
|
group_fd=1
|
||||||
config=1
|
config=1
|
||||||
# TODO both disabled and enable_on_exec are disabled for --group option,
|
disabled=0
|
||||||
# enabled otherwise, check why..
|
enable_on_exec=0
|
||||||
disabled=1
|
|
||||||
enable_on_exec=1
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ int test__syscall_open_tp_fields(void)
|
||||||
goto out_delete_evlist;
|
goto out_delete_evlist;
|
||||||
}
|
}
|
||||||
|
|
||||||
perf_evsel__config(evsel, &opts, evsel);
|
perf_evsel__config(evsel, &opts);
|
||||||
|
|
||||||
evlist->threads->map[0] = getpid();
|
evlist->threads->map[0] = getpid();
|
||||||
|
|
||||||
|
|
|
@ -52,15 +52,13 @@ struct perf_evlist *perf_evlist__new(struct cpu_map *cpus,
|
||||||
void perf_evlist__config_attrs(struct perf_evlist *evlist,
|
void perf_evlist__config_attrs(struct perf_evlist *evlist,
|
||||||
struct perf_record_opts *opts)
|
struct perf_record_opts *opts)
|
||||||
{
|
{
|
||||||
struct perf_evsel *evsel, *first;
|
struct perf_evsel *evsel;
|
||||||
|
|
||||||
if (evlist->cpus->map[0] < 0)
|
if (evlist->cpus->map[0] < 0)
|
||||||
opts->no_inherit = true;
|
opts->no_inherit = true;
|
||||||
|
|
||||||
first = perf_evlist__first(evlist);
|
|
||||||
|
|
||||||
list_for_each_entry(evsel, &evlist->entries, node) {
|
list_for_each_entry(evsel, &evlist->entries, node) {
|
||||||
perf_evsel__config(evsel, opts, first);
|
perf_evsel__config(evsel, opts);
|
||||||
|
|
||||||
if (evlist->nr_entries > 1)
|
if (evlist->nr_entries > 1)
|
||||||
evsel->attr.sample_type |= PERF_SAMPLE_ID;
|
evsel->attr.sample_type |= PERF_SAMPLE_ID;
|
||||||
|
|
|
@ -404,8 +404,8 @@ const char *perf_evsel__name(struct perf_evsel *evsel)
|
||||||
return evsel->name ?: "unknown";
|
return evsel->name ?: "unknown";
|
||||||
}
|
}
|
||||||
|
|
||||||
void perf_evsel__config(struct perf_evsel *evsel, struct perf_record_opts *opts,
|
void perf_evsel__config(struct perf_evsel *evsel,
|
||||||
struct perf_evsel *first)
|
struct perf_record_opts *opts)
|
||||||
{
|
{
|
||||||
struct perf_event_attr *attr = &evsel->attr;
|
struct perf_event_attr *attr = &evsel->attr;
|
||||||
int track = !evsel->idx; /* only the first counter needs these */
|
int track = !evsel->idx; /* only the first counter needs these */
|
||||||
|
@ -486,10 +486,8 @@ void perf_evsel__config(struct perf_evsel *evsel, struct perf_record_opts *opts,
|
||||||
attr->mmap = track;
|
attr->mmap = track;
|
||||||
attr->comm = track;
|
attr->comm = track;
|
||||||
|
|
||||||
if (perf_target__none(&opts->target) &&
|
if (perf_target__none(&opts->target) && (!evsel->leader))
|
||||||
(!opts->group || evsel == first)) {
|
|
||||||
attr->enable_on_exec = 1;
|
attr->enable_on_exec = 1;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int perf_evsel__alloc_fd(struct perf_evsel *evsel, int ncpus, int nthreads)
|
int perf_evsel__alloc_fd(struct perf_evsel *evsel, int ncpus, int nthreads)
|
||||||
|
|
|
@ -92,8 +92,7 @@ void perf_evsel__exit(struct perf_evsel *evsel);
|
||||||
void perf_evsel__delete(struct perf_evsel *evsel);
|
void perf_evsel__delete(struct perf_evsel *evsel);
|
||||||
|
|
||||||
void perf_evsel__config(struct perf_evsel *evsel,
|
void perf_evsel__config(struct perf_evsel *evsel,
|
||||||
struct perf_record_opts *opts,
|
struct perf_record_opts *opts);
|
||||||
struct perf_evsel *first);
|
|
||||||
|
|
||||||
bool perf_evsel__is_cache_op_valid(u8 type, u8 op);
|
bool perf_evsel__is_cache_op_valid(u8 type, u8 op);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче