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
perf tools: Factor out copy_config_terms() and free_config_terms()
[linux-2.6-microblaze.git]
/
tools
/
perf
/
util
/
parse-events.c
diff --git
a/tools/perf/util/parse-events.c
b/tools/perf/util/parse-events.c
index
84108c1
..
ded5808
100644
(file)
--- a/
tools/perf/util/parse-events.c
+++ b/
tools/perf/util/parse-events.c
@@
-1608,14
+1608,7
@@
int parse_events_add_pmu(struct parse_events_state *parse_state,
}
if (!parse_state->fake_pmu && perf_pmu__config(pmu, &attr, head_config, parse_state->error)) {
}
if (!parse_state->fake_pmu && perf_pmu__config(pmu, &attr, head_config, parse_state->error)) {
- struct evsel_config_term *pos, *tmp;
-
- list_for_each_entry_safe(pos, tmp, &config_terms, list) {
- list_del_init(&pos->list);
- if (pos->free_str)
- zfree(&pos->val.str);
- free(pos);
- }
+ free_config_terms(&config_terms);
return -EINVAL;
}
return -EINVAL;
}
@@
-1740,7
+1733,7
@@
parse_events__set_leader_for_uncore_aliase(char *name, struct list_head *list,
leader = list_first_entry(list, struct evsel, core.node);
evsel = list_last_entry(list, struct evsel, core.node);
leader = list_first_entry(list, struct evsel, core.node);
evsel = list_last_entry(list, struct evsel, core.node);
- total_members = evsel->
idx - leader->
idx + 1;
+ total_members = evsel->
core.idx - leader->core.
idx + 1;
leaders = calloc(total_members, sizeof(uintptr_t));
if (WARN_ON(!leaders))
leaders = calloc(total_members, sizeof(uintptr_t));
if (WARN_ON(!leaders))
@@
-1800,7
+1793,7
@@
parse_events__set_leader_for_uncore_aliase(char *name, struct list_head *list,
__evlist__for_each_entry(list, evsel) {
if (i >= nr_pmu)
i = 0;
__evlist__for_each_entry(list, evsel) {
if (i >= nr_pmu)
i = 0;
- evsel
->leader = (struct evsel *) leaders[i++]
;
+ evsel
__set_leader(evsel, (struct evsel *) leaders[i++])
;
}
/* The number of members and group name are same for each group */
}
/* The number of members and group name are same for each group */
@@
-1833,7
+1826,7
@@
void parse_events__set_leader(char *name, struct list_head *list,
if (parse_events__set_leader_for_uncore_aliase(name, list, parse_state))
return;
if (parse_events__set_leader_for_uncore_aliase(name, list, parse_state))
return;
- __evlist__set_leader(list);
+ __
perf_
evlist__set_leader(list);
leader = list_entry(list->next, struct evsel, core.node);
leader->group_name = name ? strdup(name) : NULL;
}
leader = list_entry(list->next, struct evsel, core.node);
leader->group_name = name ? strdup(name) : NULL;
}
@@
-2285,7
+2278,7
@@
int __parse_events(struct evlist *evlist, const char *str,
if (!ret) {
struct evsel *last;
if (!ret) {
struct evsel *last;
- evlist->nr_groups += parse_state.nr_groups;
+ evlist->
core.
nr_groups += parse_state.nr_groups;
last = evlist__last(evlist);
last->cmdline_group_boundary = true;
last = evlist__last(evlist);
last->cmdline_group_boundary = true;