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

perf evsel: Rename perf_evsel__group_idx() to evsel__group_idx()

As it is a 'struct evsel' method, not part of tools/lib/perf/, aka
libperf, to whom the perf_ prefix belongs.

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

Arnaldo Carvalho de Melo 2bb72dbb ae430892

+36 -40
+1 -2
tools/perf/builtin-record.c
··· 857 857 goto try_again; 858 858 } 859 859 rc = -errno; 860 - perf_evsel__open_strerror(pos, &opts->target, 861 - errno, msg, sizeof(msg)); 860 + evsel__open_strerror(pos, &opts->target, errno, msg, sizeof(msg)); 862 861 ui__error("%s\n", msg); 863 862 goto out; 864 863 }
+1 -2
tools/perf/builtin-stat.c
··· 484 484 } 485 485 } 486 486 487 - perf_evsel__open_strerror(counter, &target, 488 - errno, msg, sizeof(msg)); 487 + evsel__open_strerror(counter, &target, errno, msg, sizeof(msg)); 489 488 ui__error("%s\n", msg); 490 489 491 490 if (child_pid != -1)
+1 -2
tools/perf/builtin-top.c
··· 1051 1051 goto try_again; 1052 1052 } 1053 1053 1054 - perf_evsel__open_strerror(counter, &opts->target, 1055 - errno, msg, sizeof(msg)); 1054 + evsel__open_strerror(counter, &opts->target, errno, msg, sizeof(msg)); 1056 1055 ui__error("%s\n", msg); 1057 1056 goto out_err; 1058 1057 }
+22 -22
tools/perf/tests/parse-events.c
··· 654 654 TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); 655 655 TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel)); 656 656 TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); 657 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); 657 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 0); 658 658 TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); 659 659 660 660 /* cycles:upp */ ··· 670 670 TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host); 671 671 TEST_ASSERT_VAL("wrong precise_ip", evsel->core.attr.precise_ip == 2); 672 672 TEST_ASSERT_VAL("wrong leader", evsel->leader == leader); 673 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 1); 673 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1); 674 674 TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); 675 675 676 676 return 0; ··· 696 696 TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); 697 697 TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel)); 698 698 TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); 699 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); 699 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 0); 700 700 TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); 701 701 702 702 /* cache-references + :u modifier */ ··· 711 711 TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host); 712 712 TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); 713 713 TEST_ASSERT_VAL("wrong leader", evsel->leader == leader); 714 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 1); 714 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1); 715 715 TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); 716 716 717 717 /* cycles:k */ ··· 754 754 TEST_ASSERT_VAL("wrong group name", 755 755 !strcmp(leader->group_name, "group1")); 756 756 TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); 757 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); 757 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 0); 758 758 TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); 759 759 760 760 /* group1 cycles:kppp */ ··· 771 771 TEST_ASSERT_VAL("wrong precise_ip", evsel->core.attr.precise_ip == 3); 772 772 TEST_ASSERT_VAL("wrong leader", evsel->leader == leader); 773 773 TEST_ASSERT_VAL("wrong group name", !evsel->group_name); 774 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 1); 774 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1); 775 775 TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); 776 776 777 777 /* group2 cycles + G modifier */ ··· 789 789 TEST_ASSERT_VAL("wrong group name", 790 790 !strcmp(leader->group_name, "group2")); 791 791 TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); 792 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); 792 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 0); 793 793 TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); 794 794 795 795 /* group2 1:3 + G modifier */ ··· 803 803 TEST_ASSERT_VAL("wrong exclude host", evsel->core.attr.exclude_host); 804 804 TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); 805 805 TEST_ASSERT_VAL("wrong leader", evsel->leader == leader); 806 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 1); 806 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1); 807 807 TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); 808 808 809 809 /* instructions:u */ ··· 845 845 TEST_ASSERT_VAL("wrong group name", !evsel->group_name); 846 846 TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel)); 847 847 TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); 848 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); 848 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 0); 849 849 TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); 850 850 851 851 /* instructions:kp + p */ ··· 861 861 TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host); 862 862 TEST_ASSERT_VAL("wrong precise_ip", evsel->core.attr.precise_ip == 2); 863 863 TEST_ASSERT_VAL("wrong leader", evsel->leader == leader); 864 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 1); 864 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1); 865 865 TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); 866 866 867 867 return 0; ··· 888 888 TEST_ASSERT_VAL("wrong group name", !evsel->group_name); 889 889 TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel)); 890 890 TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); 891 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); 891 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 0); 892 892 TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); 893 893 894 894 /* instructions + G */ ··· 903 903 TEST_ASSERT_VAL("wrong exclude host", evsel->core.attr.exclude_host); 904 904 TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); 905 905 TEST_ASSERT_VAL("wrong leader", evsel->leader == leader); 906 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 1); 906 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1); 907 907 TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); 908 908 909 909 /* cycles:G */ ··· 920 920 TEST_ASSERT_VAL("wrong group name", !evsel->group_name); 921 921 TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel)); 922 922 TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); 923 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); 923 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 0); 924 924 TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); 925 925 926 926 /* instructions:G */ ··· 935 935 TEST_ASSERT_VAL("wrong exclude host", evsel->core.attr.exclude_host); 936 936 TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); 937 937 TEST_ASSERT_VAL("wrong leader", evsel->leader == leader); 938 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 1); 938 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1); 939 939 940 940 /* cycles */ 941 941 evsel = evsel__next(evsel); ··· 974 974 TEST_ASSERT_VAL("wrong group name", !evsel->group_name); 975 975 TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel)); 976 976 TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); 977 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); 977 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 0); 978 978 979 979 /* cache-misses:G + :H group modifier */ 980 980 evsel = evsel__next(evsel); ··· 988 988 TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host); 989 989 TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); 990 990 TEST_ASSERT_VAL("wrong leader", evsel->leader == leader); 991 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 1); 991 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1); 992 992 993 993 return 0; 994 994 } ··· 1014 1014 TEST_ASSERT_VAL("wrong group name", !evsel->group_name); 1015 1015 TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel)); 1016 1016 TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); 1017 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); 1017 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 0); 1018 1018 1019 1019 /* cache-misses:H + :G group modifier */ 1020 1020 evsel = evsel__next(evsel); ··· 1028 1028 TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host); 1029 1029 TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); 1030 1030 TEST_ASSERT_VAL("wrong leader", evsel->leader == leader); 1031 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 1); 1031 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1); 1032 1032 1033 1033 return 0; 1034 1034 } ··· 1054 1054 TEST_ASSERT_VAL("wrong group name", !evsel->group_name); 1055 1055 TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel)); 1056 1056 TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); 1057 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); 1057 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 0); 1058 1058 1059 1059 /* cache-misses:H + :u group modifier */ 1060 1060 evsel = evsel__next(evsel); ··· 1068 1068 TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host); 1069 1069 TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); 1070 1070 TEST_ASSERT_VAL("wrong leader", evsel->leader == leader); 1071 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 1); 1071 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1); 1072 1072 1073 1073 return 0; 1074 1074 } ··· 1094 1094 TEST_ASSERT_VAL("wrong group name", !evsel->group_name); 1095 1095 TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel)); 1096 1096 TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2); 1097 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0); 1097 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 0); 1098 1098 1099 1099 /* cache-misses:H + :uG group modifier */ 1100 1100 evsel = evsel__next(evsel); ··· 1108 1108 TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host); 1109 1109 TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); 1110 1110 TEST_ASSERT_VAL("wrong leader", evsel->leader == leader); 1111 - TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 1); 1111 + TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1); 1112 1112 1113 1113 return 0; 1114 1114 }
+5 -5
tools/perf/ui/hist.c
··· 48 48 struct hist_entry *pair; 49 49 int nr_members = evsel->core.nr_members; 50 50 51 - prev_idx = perf_evsel__group_idx(evsel); 51 + prev_idx = evsel__group_idx(evsel); 52 52 53 53 list_for_each_entry(pair, &he->pairs.head, pairs.node) { 54 54 u64 period = get_field(pair); ··· 58 58 continue; 59 59 60 60 evsel = hists_to_evsel(pair->hists); 61 - idx_delta = perf_evsel__group_idx(evsel) - prev_idx - 1; 61 + idx_delta = evsel__group_idx(evsel) - prev_idx - 1; 62 62 63 63 while (idx_delta--) { 64 64 /* ··· 82 82 len, period); 83 83 } 84 84 85 - prev_idx = perf_evsel__group_idx(evsel); 85 + prev_idx = evsel__group_idx(evsel); 86 86 } 87 87 88 88 idx_delta = nr_members - prev_idx - 1; ··· 164 164 165 165 list_for_each_entry(pair, &a->pairs.head, pairs.node) { 166 166 struct evsel *evsel = hists_to_evsel(pair->hists); 167 - fa[perf_evsel__group_idx(evsel)] = get_field(pair); 167 + fa[evsel__group_idx(evsel)] = get_field(pair); 168 168 } 169 169 170 170 list_for_each_entry(pair, &b->pairs.head, pairs.node) { 171 171 struct evsel *evsel = hists_to_evsel(pair->hists); 172 - fb[perf_evsel__group_idx(evsel)] = get_field(pair); 172 + fb[evsel__group_idx(evsel)] = get_field(pair); 173 173 } 174 174 175 175 *fields_a = fa;
+3 -4
tools/perf/util/evsel.c
··· 1721 1721 1722 1722 /* 1723 1723 * If we succeeded but had to kill clockid, fail and 1724 - * have perf_evsel__open_strerror() print us a nice 1725 - * error. 1724 + * have evsel__open_strerror() print us a nice error. 1726 1725 */ 1727 1726 if (perf_missing_features.clockid || 1728 1727 perf_missing_features.clockid_wrong) { ··· 2473 2474 return ret ? false : true; 2474 2475 } 2475 2476 2476 - int perf_evsel__open_strerror(struct evsel *evsel, struct target *target, 2477 - int err, char *msg, size_t size) 2477 + int evsel__open_strerror(struct evsel *evsel, struct target *target, 2478 + int err, char *msg, size_t size) 2478 2479 { 2479 2480 char sbuf[STRERR_BUFSIZE]; 2480 2481 int printed = 0;
+3 -3
tools/perf/util/evsel.h
··· 351 351 } 352 352 353 353 bool evsel__fallback(struct evsel *evsel, int err, char *msg, size_t msgsize); 354 - int perf_evsel__open_strerror(struct evsel *evsel, struct target *target, 355 - int err, char *msg, size_t size); 354 + int evsel__open_strerror(struct evsel *evsel, struct target *target, 355 + int err, char *msg, size_t size); 356 356 357 - static inline int perf_evsel__group_idx(struct evsel *evsel) 357 + static inline int evsel__group_idx(struct evsel *evsel) 358 358 { 359 359 return evsel->idx - evsel->leader->idx; 360 360 }