perf evsel: Rename perf_evsel__group_desc() to evsel__group_desc()

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>

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index b5dd93a..e00f624 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -462,7 +462,7 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct report
        if (perf_evsel__is_group_event(evsel)) {
                struct evsel *pos;
 
-               perf_evsel__group_desc(evsel, buf, size);
+               evsel__group_desc(evsel, buf, size);
                evname = buf;
 
                for_each_group_member(pos, evsel) {

diff --git a/tools/perf/ui/gtk/hists.c b/tools/perf/ui/gtk/hists.c
index 50c072d..40b52ae 100644 (file)
--- a/tools/perf/ui/gtk/hists.c
+++ b/tools/perf/ui/gtk/hists.c
@@ -646,7 +646,7 @@ int perf_evlist__gtk_browse_hists(struct evlist *evlist,
                                continue;
 
                        if (pos->core.nr_members > 1) {
-                               perf_evsel__group_desc(pos, buf, size);
+                               evsel__group_desc(pos, buf, size);
                                evname = buf;
                        }
                }

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 37d9562..7d03563 100644 (file)
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -2370,7 +2370,7 @@ int symbol__annotate_printf(struct map_symbol *ms, struct evsel *evsel,
 
        if (perf_evsel__is_group_event(evsel)) {
                width *= evsel->core.nr_members;
-               perf_evsel__group_desc(evsel, buf, sizeof(buf));
+               evsel__group_desc(evsel, buf, sizeof(buf));
                evsel_name = buf;
        }
 
@@ -2519,7 +2519,7 @@ int map_symbol__annotation_dump(struct map_symbol *ms, struct evsel *evsel,
                goto out_free_filename;
 
        if (perf_evsel__is_group_event(evsel)) {
-               perf_evsel__group_desc(evsel, buf, sizeof(buf));
+               evsel__group_desc(evsel, buf, sizeof(buf));
                ev_name = buf;
        }
 

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 167599e..9b3db6d 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -663,7 +663,7 @@ const char *evsel__group_name(struct evsel *evsel)
  *  For record -e 'cycles,instructions' and report --group
  *    'cycles:u, instructions:u'
  */
-int perf_evsel__group_desc(struct evsel *evsel, char *buf, size_t size)
+int evsel__group_desc(struct evsel *evsel, char *buf, size_t size)
 {
        int ret = 0;
        struct evsel *pos;

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 7160f3d..82d2d30 100644 (file)
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -212,7 +212,7 @@ int __evsel__hw_cache_type_op_res_name(u8 type, u8 op, u8 result, char *bf, size
 const char *evsel__name(struct evsel *evsel);
 
 const char *evsel__group_name(struct evsel *evsel);
-int perf_evsel__group_desc(struct evsel *evsel, char *buf, size_t size);
+int evsel__group_desc(struct evsel *evsel, char *buf, size_t size);
 
 void __perf_evsel__set_sample_bit(struct evsel *evsel,
                                  enum perf_event_sample_format bit);

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index fa77574..bce49ae 100644 (file)
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -2698,7 +2698,7 @@ int __hists__scnprintf_title(struct hists *hists, char *bf, size_t size, bool sh
        if (perf_evsel__is_group_event(evsel)) {
                struct evsel *pos;
 
-               perf_evsel__group_desc(evsel, buf, buflen);
+               evsel__group_desc(evsel, buf, buflen);
                ev_name = buf;
 
                for_each_group_member(pos, evsel) {