|
@@ -1692,7 +1692,10 @@ static void print_footer(void)
|
|
"the same PMU. Try reorganizing the group.\n");
|
|
"the same PMU. Try reorganizing the group.\n");
|
|
}
|
|
}
|
|
|
|
|
|
-static void print_counters(struct timespec *ts, int argc, const char **argv)
|
|
|
|
|
|
+static void
|
|
|
|
+perf_evlist__print_counters(struct perf_evlist *evlist,
|
|
|
|
+ struct timespec *ts,
|
|
|
|
+ int argc, const char **argv)
|
|
{
|
|
{
|
|
int interval = stat_config.interval;
|
|
int interval = stat_config.interval;
|
|
struct perf_evsel *counter;
|
|
struct perf_evsel *counter;
|
|
@@ -1724,14 +1727,14 @@ static void print_counters(struct timespec *ts, int argc, const char **argv)
|
|
print_aggr(prefix);
|
|
print_aggr(prefix);
|
|
break;
|
|
break;
|
|
case AGGR_THREAD:
|
|
case AGGR_THREAD:
|
|
- evlist__for_each_entry(evsel_list, counter) {
|
|
|
|
|
|
+ evlist__for_each_entry(evlist, counter) {
|
|
if (is_duration_time(counter))
|
|
if (is_duration_time(counter))
|
|
continue;
|
|
continue;
|
|
print_aggr_thread(counter, prefix);
|
|
print_aggr_thread(counter, prefix);
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case AGGR_GLOBAL:
|
|
case AGGR_GLOBAL:
|
|
- evlist__for_each_entry(evsel_list, counter) {
|
|
|
|
|
|
+ evlist__for_each_entry(evlist, counter) {
|
|
if (is_duration_time(counter))
|
|
if (is_duration_time(counter))
|
|
continue;
|
|
continue;
|
|
print_counter_aggr(counter, prefix);
|
|
print_counter_aggr(counter, prefix);
|
|
@@ -1743,7 +1746,7 @@ static void print_counters(struct timespec *ts, int argc, const char **argv)
|
|
if (metric_only)
|
|
if (metric_only)
|
|
print_no_aggr_metric(prefix);
|
|
print_no_aggr_metric(prefix);
|
|
else {
|
|
else {
|
|
- evlist__for_each_entry(evsel_list, counter) {
|
|
|
|
|
|
+ evlist__for_each_entry(evlist, counter) {
|
|
if (is_duration_time(counter))
|
|
if (is_duration_time(counter))
|
|
continue;
|
|
continue;
|
|
print_counter(counter, prefix);
|
|
print_counter(counter, prefix);
|
|
@@ -1761,6 +1764,11 @@ static void print_counters(struct timespec *ts, int argc, const char **argv)
|
|
fflush(stat_config.output);
|
|
fflush(stat_config.output);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static void print_counters(struct timespec *ts, int argc, const char **argv)
|
|
|
|
+{
|
|
|
|
+ perf_evlist__print_counters(evsel_list, ts, argc, argv);
|
|
|
|
+}
|
|
|
|
+
|
|
static volatile int signr = -1;
|
|
static volatile int signr = -1;
|
|
|
|
|
|
static void skip_signal(int signo)
|
|
static void skip_signal(int signo)
|