[PATCH v3] perf c2c: fix '-e list'

[Ian Rogers]

When the event is passed as list, the default events should be listed as
per 'perf mem record -e list'. Previous behavior is:

$ perf c2c record -e list
failed: event 'list' not found, use '-e list' to get list of available events

 Usage: perf c2c record [<options>] [<command>]
    or: perf c2c record [<options>] -- <command> [<options>]

    -e, --event <event>   event selector. Use 'perf mem record -e list' to list 
available events

New behavior:

$ perf c2c record -e list
ldlat-loads  : available
ldlat-stores : available

v3: is a rebase.
v2: addresses review comments by Jiri Olsa.
https://lore.kernel.org/lkml/20191127081844.GH32367@krava/
Signed-off-by: Ian Rogers <irog...@google.com>
---
 tools/perf/Documentation/perf-c2c.txt |  2 +-
 tools/perf/builtin-c2c.c              |  9 ++++++++-
 tools/perf/builtin-mem.c              | 24 +++++++-----------------
 tools/perf/util/mem-events.c          | 15 +++++++++++++++
 tools/perf/util/mem-events.h          |  2 ++
 5 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/tools/perf/Documentation/perf-c2c.txt 
b/tools/perf/Documentation/perf-c2c.txt
index 2133eb320cb0..98efdab5fbd4 100644
--- a/tools/perf/Documentation/perf-c2c.txt
+++ b/tools/perf/Documentation/perf-c2c.txt
@@ -40,7 +40,7 @@ RECORD OPTIONS
 --------------
 -e::
 --event=::
-       Select the PMU event. Use 'perf mem record -e list'
+       Select the PMU event. Use 'perf c2c record -e list'
        to list available events.
 
 -v::
diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
index 1baf4cae086f..d617d5682c68 100644
--- a/tools/perf/builtin-c2c.c
+++ b/tools/perf/builtin-c2c.c
@@ -2887,8 +2887,15 @@ static int parse_record_events(const struct option *opt,
 {
        bool *event_set = (bool *) opt->value;
 
+       if (!strcmp(str, "list")) {
+               perf_mem_events__list();
+               exit(0);
+       }
+       if (perf_mem_events__parse(str))
+               exit(-1);
+
        *event_set = true;
-       return perf_mem_events__parse(str);
+       return 0;
 }
 
 
diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c
index 68a7eb84561a..3523279af6af 100644
--- a/tools/perf/builtin-mem.c
+++ b/tools/perf/builtin-mem.c
@@ -38,26 +38,16 @@ static int parse_record_events(const struct option *opt,
                               const char *str, int unset __maybe_unused)
 {
        struct perf_mem *mem = *(struct perf_mem **)opt->value;
-       int j;
 
-       if (strcmp(str, "list")) {
-               if (!perf_mem_events__parse(str)) {
-                       mem->operation = 0;
-                       return 0;
-               }
-               exit(-1);
+       if (!strcmp(str, "list")) {
+               perf_mem_events__list();
+               exit(0);
        }
+       if (perf_mem_events__parse(str))
+               exit(-1);
 
-       for (j = 0; j < PERF_MEM_EVENTS__MAX; j++) {
-               struct perf_mem_event *e = &perf_mem_events[j];
-
-               fprintf(stderr, "%-13s%-*s%s\n",
-                       e->tag,
-                       verbose > 0 ? 25 : 0,
-                       verbose > 0 ? perf_mem_events__name(j) : "",
-                       e->supported ? ": available" : "");
-       }
-       exit(0);
+       mem->operation = 0;
+       return 0;
 }
 
 static const char * const __usage[] = {
diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c
index aa29589f6904..ea0af0bc4314 100644
--- a/tools/perf/util/mem-events.c
+++ b/tools/perf/util/mem-events.c
@@ -103,6 +103,21 @@ int perf_mem_events__init(void)
        return found ? 0 : -ENOENT;
 }
 
+void perf_mem_events__list(void)
+{
+       int j;
+
+       for (j = 0; j < PERF_MEM_EVENTS__MAX; j++) {
+               struct perf_mem_event *e = &perf_mem_events[j];
+
+               fprintf(stderr, "%-13s%-*s%s\n",
+                       e->tag,
+                       verbose > 0 ? 25 : 0,
+                       verbose > 0 ? perf_mem_events__name(j) : "",
+                       e->supported ? ": available" : "");
+       }
+}
+
 static const char * const tlb_access[] = {
        "N/A",
        "HIT",
diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h
index f1389bdae7bf..904dad34f7f7 100644
--- a/tools/perf/util/mem-events.h
+++ b/tools/perf/util/mem-events.h
@@ -39,6 +39,8 @@ int perf_mem_events__init(void);
 
 char *perf_mem_events__name(int i);
 
+void perf_mem_events__list(void);
+
 struct mem_info;
 int perf_mem__tlb_scnprintf(char *out, size_t sz, struct mem_info *mem_info);
 int perf_mem__lvl_scnprintf(char *out, size_t sz, struct mem_info *mem_info);
-- 
2.26.2.645.ge9eca65c58-goog