perf evlist: Rename struct perf_evlist to struct evlist

[linux-block.git] / tools / perf / util / stat-shadow.c

diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c
index 656065af497129509e0b8f980ac2e0fac6a050bb..d81bcab2e64cc5e9579681e0d7ca9778854a53a0 100644 (file)
--- a/tools/perf/util/stat-shadow.c
+++ b/tools/perf/util/stat-shadow.c
@@ -25,7 +25,7 @@ struct stats walltime_nsecs_stats;
 
 struct saved_value {
        struct rb_node rb_node;
-       struct perf_evsel *evsel;
+       struct evsel *evsel;
        enum stat_type type;
        int ctx;
        int cpu;
@@ -94,7 +94,7 @@ static void saved_value_delete(struct rblist *rblist __maybe_unused,
        free(v);
 }
 
-static struct saved_value *saved_value_lookup(struct perf_evsel *evsel,
+static struct saved_value *saved_value_lookup(struct evsel *evsel,
                                              int cpu,
                                              bool create,
                                              enum stat_type type,
@@ -146,7 +146,7 @@ void perf_stat__init_shadow_stats(void)
        runtime_stat__init(&rt_stat);
 }
 
-static int evsel_context(struct perf_evsel *evsel)
+static int evsel_context(struct evsel *evsel)
 {
        int ctx = 0;
 
@@ -207,7 +207,7 @@ static void update_runtime_stat(struct runtime_stat *st,
  * more semantic information such as miss/hit ratios,
  * instruction rates, etc:
  */
-void perf_stat__update_shadow_stats(struct perf_evsel *counter, u64 count,
+void perf_stat__update_shadow_stats(struct evsel *counter, u64 count,
                                    int cpu, struct runtime_stat *st)
 {
        int ctx = evsel_context(counter);
@@ -299,10 +299,10 @@ static const char *get_ratio_color(enum grc_type type, double ratio)
        return color;
 }
 
-static struct perf_evsel *perf_stat__find_event(struct perf_evlist *evsel_list,
+static struct evsel *perf_stat__find_event(struct evlist *evsel_list,
                                                const char *name)
 {
-       struct perf_evsel *c2;
+       struct evsel *c2;
 
        evlist__for_each_entry (evsel_list, c2) {
                if (!strcasecmp(c2->name, name) && !c2->collect_stat)
@@ -312,9 +312,9 @@ static struct perf_evsel *perf_stat__find_event(struct perf_evlist *evsel_list,
 }
 
 /* Mark MetricExpr target events and link events using them to them. */
-void perf_stat__collect_metric_expr(struct perf_evlist *evsel_list)
+void perf_stat__collect_metric_expr(struct evlist *evsel_list)
 {
-       struct perf_evsel *counter, *leader, **metric_events, *oc;
+       struct evsel *counter, *leader, **metric_events, *oc;
        bool found;
        const char **metric_names;
        int i;
@@ -332,7 +332,7 @@ void perf_stat__collect_metric_expr(struct perf_evlist *evsel_list)
                                                &metric_names, &num_metric_names) < 0)
                                continue;
 
-                       metric_events = calloc(sizeof(struct perf_evsel *),
+                       metric_events = calloc(sizeof(struct evsel *),
                                               num_metric_names + 1);
                        if (!metric_events)
                                return;
@@ -415,7 +415,7 @@ static double runtime_stat_n(struct runtime_stat *st,
 
 static void print_stalled_cycles_frontend(struct perf_stat_config *config,
                                          int cpu,
-                                         struct perf_evsel *evsel, double avg,
+                                         struct evsel *evsel, double avg,
                                          struct perf_stat_output_ctx *out,
                                          struct runtime_stat *st)
 {
@@ -439,7 +439,7 @@ static void print_stalled_cycles_frontend(struct perf_stat_config *config,
 
 static void print_stalled_cycles_backend(struct perf_stat_config *config,
                                         int cpu,
-                                        struct perf_evsel *evsel, double avg,
+                                        struct evsel *evsel, double avg,
                                         struct perf_stat_output_ctx *out,
                                         struct runtime_stat *st)
 {
@@ -459,7 +459,7 @@ static void print_stalled_cycles_backend(struct perf_stat_config *config,
 
 static void print_branch_misses(struct perf_stat_config *config,
                                int cpu,
-                               struct perf_evsel *evsel,
+                               struct evsel *evsel,
                                double avg,
                                struct perf_stat_output_ctx *out,
                                struct runtime_stat *st)
@@ -480,7 +480,7 @@ static void print_branch_misses(struct perf_stat_config *config,
 
 static void print_l1_dcache_misses(struct perf_stat_config *config,
                                   int cpu,
-                                  struct perf_evsel *evsel,
+                                  struct evsel *evsel,
                                   double avg,
                                   struct perf_stat_output_ctx *out,
                                   struct runtime_stat *st)
@@ -502,7 +502,7 @@ static void print_l1_dcache_misses(struct perf_stat_config *config,
 
 static void print_l1_icache_misses(struct perf_stat_config *config,
                                   int cpu,
-                                  struct perf_evsel *evsel,
+                                  struct evsel *evsel,
                                   double avg,
                                   struct perf_stat_output_ctx *out,
                                   struct runtime_stat *st)
@@ -523,7 +523,7 @@ static void print_l1_icache_misses(struct perf_stat_config *config,
 
 static void print_dtlb_cache_misses(struct perf_stat_config *config,
                                    int cpu,
-                                   struct perf_evsel *evsel,
+                                   struct evsel *evsel,
                                    double avg,
                                    struct perf_stat_output_ctx *out,
                                    struct runtime_stat *st)
@@ -543,7 +543,7 @@ static void print_dtlb_cache_misses(struct perf_stat_config *config,
 
 static void print_itlb_cache_misses(struct perf_stat_config *config,
                                    int cpu,
-                                   struct perf_evsel *evsel,
+                                   struct evsel *evsel,
                                    double avg,
                                    struct perf_stat_output_ctx *out,
                                    struct runtime_stat *st)
@@ -563,7 +563,7 @@ static void print_itlb_cache_misses(struct perf_stat_config *config,
 
 static void print_ll_cache_misses(struct perf_stat_config *config,
                                  int cpu,
-                                 struct perf_evsel *evsel,
+                                 struct evsel *evsel,
                                  double avg,
                                  struct perf_stat_output_ctx *out,
                                  struct runtime_stat *st)
@@ -686,7 +686,7 @@ static double td_be_bound(int ctx, int cpu, struct runtime_stat *st)
 }
 
 static void print_smi_cost(struct perf_stat_config *config,
-                          int cpu, struct perf_evsel *evsel,
+                          int cpu, struct evsel *evsel,
                           struct perf_stat_output_ctx *out,
                           struct runtime_stat *st)
 {
@@ -712,7 +712,7 @@ static void print_smi_cost(struct perf_stat_config *config,
 
 static void generic_metric(struct perf_stat_config *config,
                           const char *metric_expr,
-                          struct perf_evsel **metric_events,
+                          struct evsel **metric_events,
                           char *name,
                           const char *metric_name,
                           double avg,
@@ -780,7 +780,7 @@ static void generic_metric(struct perf_stat_config *config,
 }
 
 void perf_stat__print_shadow_stats(struct perf_stat_config *config,
-                                  struct perf_evsel *evsel,
+                                  struct evsel *evsel,
                                   double avg, int cpu,
                                   struct perf_stat_output_ctx *out,
                                   struct rblist *metric_events,
@@ -819,7 +819,8 @@ void perf_stat__print_shadow_stats(struct perf_stat_config *config,
                                        "stalled cycles per insn",
                                        ratio);
                } else if (have_frontend_stalled) {
-                       print_metric(config, ctxp, NULL, NULL,
+                       out->new_line(config, ctxp);
+                       print_metric(config, ctxp, NULL, "%7.2f ",
                                     "stalled cycles per insn", 0);
                }
        } else if (perf_evsel__match(evsel, HARDWARE, HW_BRANCH_MISSES)) {