perf metric: Code cleanup with map_for_each_event()
PATCH 1/1 perf metric: Code cleanup with map_for_each_event()
Since we have introduced map_for_each_event() to walk the 'pmu_events_map', clean up metricgroup__print() and metricgroup__has_metric() with it.
--- tools/perf/util/metricgroup.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-)
tools/perf/util/metricgroup.c +13 -20
@@ -26,6 +26,17 @@#include "util.h" #include <asm/bug.h> +#define map_for_each_event (__pe, __idx, __map) \ + for (__idx = 0, __pe = &__map->table[__idx]; \ + __pe->name || __pe->metric_group || __pe->metric_name; \ + __pe = &__map->table[++__idx]) + +#define map_for_each_metric (__pe, __idx, __map, __metric) \ + map_for_each_event(__pe, __idx, __map) \ + if (__pe->metric_expr && \ + (match_metric(__pe->metric_group, __metric) || \ + match_metric(__pe->metric_name, __metric))) +struct metric_event *metricgroup__lookup (struct rblist *metric_events,struct evsel *evsel,bool create)
@@ -475,12 +486,9 @@ void metricgroup__print(bool metrics, bool metricgroups, char *filter, groups.node_new = mep_new; groups.node_cmp = mep_cmp; groups.node_delete = mep_delete; -for (i =0 ; ; i++) { +map_for_each_event (pe, i, map) {const char *g; - pe = &map->table[i]; -if (!pe->name && !pe->metric_group && !pe->metric_name) -break ;if (!pe->metric_expr)continue ; g = pe->metric_group;
@@ -745,17 +753,6 @@ static int __add_metric(struct list_head *metric_list,return 0 ; } -#define map_for_each_event (__pe, __idx, __map) \ - for (__idx = 0, __pe = &__map->table[__idx]; \ - __pe->name || __pe->metric_group || __pe->metric_name; \ - __pe = &__map->table[++__idx]) - -#define map_for_each_metric (__pe, __idx, __map, __metric) \ - map_for_each_event(__pe, __idx, __map) \ - if (__pe->metric_expr && \ - (match_metric(__pe->metric_group, __metric) || \ - match_metric(__pe->metric_name, __metric))) -static struct pmu_event *find_metric (const char *metric,struct pmu_events_map *map) {struct pmu_event *pe;
@@ -1092,11 +1089,7 @@ bool metricgroup__has_metric(const char *metric)if (!map)return false; -for (i =0 ; ; i++) { - pe = &map->table[i]; - -if (!pe->name && !pe->metric_group && !pe->metric_name) -break ; +map_for_each_event (pe, i, map) {if (!pe->metric_expr)continue ;if (match_metric (pe->metric_name, metric))
Signature · 1 line
2.17.1
Hello,
Quoted 5 lines · Wei Li
Since we have introduced
map_for_each_event()to walk the 'pmu_events_map', clean upmetricgroup__print()andmetricgroup__has_metric()with it.Signed-off-by Wei Li <[email protected]>
A nit-pick below:
Quoted 13 lines
--- tools/perf/util/metricgroup.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-)tools/perf/util/metricgroup.c +1
-0@@ -26,6 +26,17 @@#include "util.h" #include <asm/bug.h> +#define map_for_each_event (__pe, __idx, __map) \
tools/perf/util/metricgroup.c line 39
Quoted 10 lines
tools/perf/util/metricgroup.c +10
-0+for (__idx =0 , __pe = &__map->table[__idx]; \ + __pe->name || __pe->metric_group || __pe->metric_name; \ + __pe = &__map->table[++__idx]) + +#define map_for_each_metric (__pe, __idx, __map, __metric) \ + map_for_each_event(__pe, __idx, __map) \ + if (__pe->metric_expr && \ + (match_metric(__pe->metric_group, __metric) || \ + match_metric(__pe->metric_name, __metric))) +
You may consider adding a declaration of match_metric() here. Right now, all users are below the function so it's ok but having the macro here can enable future addition above IMHO.
Thanks
Namhyung
Quoted 51 lines
tools/perf/util/metricgroup.c +2
-21struct metric_event *metricgroup__lookup (struct rblist *metric_events,struct evsel *evsel,bool create)@@ -475,12 +486,9 @@ void metricgroup__print(bool metrics, bool metricgroups, char *filter, groups.node_new = mep_new; groups.node_cmp = mep_cmp; groups.node_delete = mep_delete; -for (i =0 ; ; i++) { +map_for_each_event (pe, i, map) {const char *g; - pe = &map->table[i]; -if (!pe->name && !pe->metric_group && !pe->metric_name) -break ;if (!pe->metric_expr)continue ; g = pe->metric_group;@@ -745,17 +753,6 @@ static int __add_metric(struct list_head *metric_list,return 0 ; } -#define map_for_each_event (__pe, __idx, __map) \ - for (__idx = 0, __pe = &__map->table[__idx]; \ - __pe->name || __pe->metric_group || __pe->metric_name; \ - __pe = &__map->table[++__idx]) - -#define map_for_each_metric (__pe, __idx, __map, __metric) \ - map_for_each_event(__pe, __idx, __map) \ - if (__pe->metric_expr && \ - (match_metric(__pe->metric_group, __metric) || \ - match_metric(__pe->metric_name, __metric))) -static struct pmu_event *find_metric (const char *metric,struct pmu_events_map *map) {struct pmu_event *pe;@@ -1092,11 +1089,7 @@ bool metricgroup__has_metric(const char *metric)if (!map)return false; -for (i =0 ; ; i++) { - pe = &map->table[i]; - -if (!pe->name && !pe->metric_group && !pe->metric_name) -break ; +map_for_each_event (pe, i, map) {if (!pe->metric_expr)continue ;if (match_metric (pe->metric_name, metric)) --2.17.1
Hi Namhyung,
Quoted 26 lines · Namhyung Kim
Hello,
Quoted 5 lines · Wei Li
Since we have introduced
map_for_each_event()to walk the 'pmu_events_map', clean upmetricgroup__print()andmetricgroup__has_metric()with it.Signed-off-by Wei Li <[email protected]>Acked-by Namhyung Kim <[email protected]>A nit-pick below:
Quoted 12 lines
--- tools/perf/util/metricgroup.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-)tools/perf/util/metricgroup.c +0
-0@@ -26,6 +26,17 @@#include "util.h" #include <asm/bug.h>
Quoted 16 lines
tools/perf/util/metricgroup.c line 39
Quoted 11 lines
tools/perf/util/metricgroup.c +11
-0+#define map_for_each_event (__pe, __idx, __map) \ + for (__idx = 0, __pe = &__map->table[__idx]; \ + __pe->name || __pe->metric_group || __pe->metric_name; \ + __pe = &__map->table[++__idx]) + +#define map_for_each_metric (__pe, __idx, __map, __metric) \ + map_for_each_event(__pe, __idx, __map) \ + if (__pe->metric_expr && \ + (match_metric(__pe->metric_group, __metric) || \ + match_metric(__pe->metric_name, __metric))) +You may consider adding a declaration of
match_metric()here. Right now, all users are below the function so it's ok but having the macro here can enable future addition above IMHO.
Thanks for spotting that.
I'd like to move them just below match_metric() for now, when we really need to use them somewhere else, we may move them to header file then.
Thanks,
Wei