projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[linux-2.6-microblaze.git]
/
tools
/
perf
/
util
/
stat-display.c
diff --git
a/tools/perf/util/stat-display.c
b/tools/perf/util/stat-display.c
index
a76fff5
..
c588a6b
100644
(file)
--- a/
tools/perf/util/stat-display.c
+++ b/
tools/perf/util/stat-display.c
@@
-541,7
+541,7
@@
static void uniquify_event_name(struct evsel *counter)
char *config;
int ret = 0;
char *config;
int ret = 0;
- if (counter->uniquified_name ||
+ if (counter->uniquified_name ||
counter->use_config_name ||
!counter->pmu_name || !strncmp(counter->name, counter->pmu_name,
strlen(counter->pmu_name)))
return;
!counter->pmu_name || !strncmp(counter->name, counter->pmu_name,
strlen(counter->pmu_name)))
return;
@@
-555,10
+555,8
@@
static void uniquify_event_name(struct evsel *counter)
}
} else {
if (perf_pmu__has_hybrid()) {
}
} else {
if (perf_pmu__has_hybrid()) {
- if (!counter->use_config_name) {
- ret = asprintf(&new_name, "%s/%s/",
- counter->pmu_name, counter->name);
- }
+ ret = asprintf(&new_name, "%s/%s/",
+ counter->pmu_name, counter->name);
} else {
ret = asprintf(&new_name, "%s [%s]",
counter->name, counter->pmu_name);
} else {
ret = asprintf(&new_name, "%s [%s]",
counter->name, counter->pmu_name);
@@
-827,11
+825,11
@@
static void counter_aggr_cb(struct perf_stat_config *config __maybe_unused,
bool first __maybe_unused)
{
struct caggr_data *cd = data;
bool first __maybe_unused)
{
struct caggr_data *cd = data;
- struct perf_
stat_evsel *ps = counter->stats
;
+ struct perf_
counts_values *aggr = &counter->counts->aggr
;
- cd->avg += a
vg_stats(&ps->res_stats[0])
;
- cd->avg_enabled += a
vg_stats(&ps->res_stats[1])
;
- cd->avg_running += a
vg_stats(&ps->res_stats[2])
;
+ cd->avg += a
ggr->val
;
+ cd->avg_enabled += a
ggr->ena
;
+ cd->avg_running += a
ggr->run
;
}
/*
}
/*