lkml.org 
[lkml]   [2016]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/31] perf mem: Introduce perf_mem_events__name function
    Date
    From: Jiri Olsa <jolsa@kernel.org>

    Wrap perf_mem_events[].name into perf_mem_events__name() so we could alter the
    events name if needed.

    This will be handy when changing latency settings for loads event in following
    patch.

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Stephane Eranian <eranian@google.com>
    Link: http://lkml.kernel.org/r/1456303616-26926-3-git-send-email-jolsa@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/builtin-mem.c | 6 +++---
    tools/perf/util/mem-events.c | 5 +++++
    tools/perf/util/mem-events.h | 1 +
    3 files changed, 9 insertions(+), 3 deletions(-)

    diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c
    index f1fa7b8d1f69..88aeac9aa1da 100644
    --- a/tools/perf/builtin-mem.c
    +++ b/tools/perf/builtin-mem.c
    @@ -43,7 +43,7 @@ static int parse_record_events(const struct option *opt,
    fprintf(stderr, "%-13s%-*s%s\n",
    e->tag,
    verbose ? 25 : 0,
    - verbose ? e->name : "",
    + verbose ? perf_mem_events__name(j) : "",
    e->supported ? ": available" : "");
    }
    exit(0);
    @@ -95,12 +95,12 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem)

    if (!perf_mem_events[j].supported) {
    pr_err("failed: event '%s' not supported\n",
    - perf_mem_events[j].name);
    + perf_mem_events__name(j));
    return -1;
    }

    rec_argv[i++] = "-e";
    - rec_argv[i++] = perf_mem_events[j].name;
    + rec_argv[i++] = perf_mem_events__name(j);
    };

    for (j = 0; j < argc; j++, i++)
    diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c
    index e21853fe1312..2330db510976 100644
    --- a/tools/perf/util/mem-events.c
    +++ b/tools/perf/util/mem-events.c
    @@ -19,6 +19,11 @@ struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX] = {

    #undef E

    +char *perf_mem_events__name(int i)
    +{
    + return (char *)perf_mem_events[i].name;
    +}
    +
    int perf_mem_events__parse(const char *str)
    {
    char *tok, *saveptr = NULL;
    diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h
    index 75c1660bda62..2a91b959de62 100644
    --- a/tools/perf/util/mem-events.h
    +++ b/tools/perf/util/mem-events.h
    @@ -22,4 +22,5 @@ extern struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX];
    int perf_mem_events__parse(const char *str);
    int perf_mem_events__init(void);

    +char *perf_mem_events__name(int i);
    #endif /* __PERF_MEM_EVENTS_H */
    --
    2.5.0
    \
     
     \ /
      Last update: 2016-02-25 03:41    [W:4.113 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site