Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf evlist: Use the right prefix for 'struct evlist' event group methods

perf_evlist__ is for 'struct perf_evlist' methods, in tools/lib/perf/,
go on completing this split.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+11 -16
+1 -1
tools/perf/builtin-annotate.c
··· 598 598 HEADER_BRANCH_STACK); 599 599 600 600 if (annotate.group_set) 601 - perf_evlist__force_leader(annotate.session->evlist); 601 + evlist__force_leader(annotate.session->evlist); 602 602 603 603 ret = symbol__annotation_init(); 604 604 if (ret < 0)
+1 -1
tools/perf/builtin-record.c
··· 923 923 if ((errno == EINVAL || errno == EBADF) && 924 924 pos->leader != pos && 925 925 pos->weak_group) { 926 - pos = perf_evlist__reset_weak_group(evlist, pos, true); 926 + pos = evlist__reset_weak_group(evlist, pos, true); 927 927 goto try_again; 928 928 } 929 929 rc = -errno;
+1 -1
tools/perf/builtin-report.c
··· 211 211 struct evlist *evlist) 212 212 { 213 213 if (report->group_set) 214 - perf_evlist__force_leader(evlist); 214 + evlist__force_leader(evlist); 215 215 } 216 216 217 217 static int process_feature_event(struct perf_session *session,
+1 -1
tools/perf/builtin-stat.c
··· 759 759 if ((errno == EINVAL || errno == EBADF) && 760 760 counter->leader != counter && 761 761 counter->weak_group) { 762 - perf_evlist__reset_weak_group(evsel_list, counter, false); 762 + evlist__reset_weak_group(evsel_list, counter, false); 763 763 assert(counter->reset_group); 764 764 second_pass = true; 765 765 continue;
+2 -4
tools/perf/util/auxtrace.c
··· 62 62 * Make a group from 'leader' to 'last', requiring that the events were not 63 63 * already grouped to a different leader. 64 64 */ 65 - static int perf_evlist__regroup(struct evlist *evlist, 66 - struct evsel *leader, 67 - struct evsel *last) 65 + static int evlist__regroup(struct evlist *evlist, struct evsel *leader, struct evsel *last) 68 66 { 69 67 struct evsel *evsel; 70 68 bool grp; ··· 773 775 evsel->core.attr.aux_sample_size = term->val.aux_sample_size; 774 776 /* If possible, group with the AUX event */ 775 777 if (aux_evsel && evsel->core.attr.aux_sample_size) 776 - perf_evlist__regroup(evlist, aux_evsel, evsel); 778 + evlist__regroup(evlist, aux_evsel, evsel); 777 779 } 778 780 } 779 781
+2 -4
tools/perf/util/evlist.c
··· 1650 1650 * the group display. Set the artificial group and set the leader's 1651 1651 * forced_leader flag to notify the display code. 1652 1652 */ 1653 - void perf_evlist__force_leader(struct evlist *evlist) 1653 + void evlist__force_leader(struct evlist *evlist) 1654 1654 { 1655 1655 if (!evlist->nr_groups) { 1656 1656 struct evsel *leader = evlist__first(evlist); ··· 1660 1660 } 1661 1661 } 1662 1662 1663 - struct evsel *perf_evlist__reset_weak_group(struct evlist *evsel_list, 1664 - struct evsel *evsel, 1665 - bool close) 1663 + struct evsel *evlist__reset_weak_group(struct evlist *evsel_list, struct evsel *evsel, bool close) 1666 1664 { 1667 1665 struct evsel *c2, *leader; 1668 1666 bool is_open = true;
+3 -4
tools/perf/util/evlist.h
··· 324 324 325 325 bool perf_evlist__exclude_kernel(struct evlist *evlist); 326 326 327 - void perf_evlist__force_leader(struct evlist *evlist); 327 + void evlist__force_leader(struct evlist *evlist); 328 328 329 - struct evsel *perf_evlist__reset_weak_group(struct evlist *evlist, 330 - struct evsel *evsel, 331 - bool close); 329 + struct evsel *evlist__reset_weak_group(struct evlist *evlist, struct evsel *evsel, bool close); 330 + 332 331 #define EVLIST_CTL_CMD_ENABLE_TAG "enable" 333 332 #define EVLIST_CTL_CMD_DISABLE_TAG "disable" 334 333 #define EVLIST_CTL_CMD_ACK_TAG "ack\n"