lkml.org 
[lkml]   [2017]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/10] perf, tools: Support per pmu json aliases
    Date
    From: Andi Kleen <ak@linux.intel.com>

    Add support for registering json aliases per PMU. Any alias
    with an unit matching the prefix is registered to the PMU.
    Uncore has multiple instances of most units, so all
    these aliases get registered for each individual PMU
    (this is important later to run the event on every instance
    of the PMU).

    To avoid printing the events multiple times in perf list
    filter out duplicated events during printing.

    v2: Rely on uncore_ prefix already in unit
    v3: Document why calls were reordered
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    ---
    tools/perf/util/pmu.c | 13 +++++++++----
    1 file changed, 9 insertions(+), 4 deletions(-)

    diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
    index 6dc3cc050105..8e9d00fd418e 100644
    --- a/tools/perf/util/pmu.c
    +++ b/tools/perf/util/pmu.c
    @@ -590,14 +590,16 @@ static struct perf_pmu *pmu_lookup(const char *name)
    if (pmu_format(name, &format))
    return NULL;

    - if (pmu_aliases(name, &aliases))
    + /*
    + * Check the type first to avoid unnecessary work.
    + */
    + if (pmu_type(name, &type))
    return NULL;

    - pmu_add_cpu_aliases(&aliases, name);
    -
    - if (pmu_type(name, &type))
    + if (pmu_aliases(name, &aliases))
    return NULL;

    + pmu_add_cpu_aliases(&aliases, name);
    pmu = zalloc(sizeof(*pmu));
    if (!pmu)
    return NULL;
    @@ -1195,6 +1197,9 @@ void print_pmu_events(const char *event_glob, bool name_only, bool quiet_flag,
    len = j;
    qsort(aliases, len, sizeof(struct sevent), cmp_sevent);
    for (j = 0; j < len; j++) {
    + /* Skip duplicates */
    + if (j > 0 && !strcmp(aliases[j].name, aliases[j - 1].name))
    + continue;
    if (name_only) {
    printf("%s ", aliases[j].name);
    continue;
    --
    2.9.3
    \
     
     \ /
      Last update: 2017-01-28 03:05    [W:2.106 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site