Merge tag 'for-5.4/io_uring-2019-09-15' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / tools / perf / util / metricgroup.h

diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h
index 5c52097..475c7f9 100644 (file)
--- a/tools/perf/util/metricgroup.h
+++ b/tools/perf/util/metricgroup.h
@@ -1,15 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0-only
 #ifndef METRICGROUP_H
 #define METRICGROUP_H 1
 
-#include "linux/list.h"
-#include "rblist.h"
-#include <subcmd/parse-options.h>
-#include "evlist.h"
-#include "strbuf.h"
+#include <linux/list.h>
+#include <linux/rbtree.h>
+#include <stdbool.h>
+
+struct evsel;
+struct option;
+struct rblist;
 
 struct metric_event {
        struct rb_node nd;
-       struct perf_evsel *evsel;
+       struct evsel *evsel;
        struct list_head head; /* list of metric_expr */
 };
 
@@ -17,11 +20,12 @@ struct metric_expr {
        struct list_head nd;
        const char *metric_expr;
        const char *metric_name;
-       struct perf_evsel **metric_events;
+       const char *metric_unit;
+       struct evsel **metric_events;
 };
 
 struct metric_event *metricgroup__lookup(struct rblist *metric_events,
-                                        struct perf_evsel *evsel,
+                                        struct evsel *evsel,
                                         bool create);
 int metricgroup__parse_groups(const struct option *opt,
                        const char *str,