lkml.org 
[lkml]   [2015]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/urgent] perf stat: Rename struct perf_counts:: cpu member to values
    Commit-ID:  57b289159ab4fe1f7b2b531464cf67f65e48dd00
    Gitweb: http://git.kernel.org/tip/57b289159ab4fe1f7b2b531464cf67f65e48dd00
    Author: Jiri Olsa <jolsa@kernel.org>
    AuthorDate: Fri, 26 Jun 2015 11:29:12 +0200
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Fri, 26 Jun 2015 11:25:03 -0300

    perf stat: Rename struct perf_counts::cpu member to values

    Renaming 'struct xyarray *cpu' pointer to more fitting/generic values,
    because now we store both cpu and thread values.

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    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/1435310967-14570-8-git-send-email-jolsa@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/stat.c | 12 ++++++------
    tools/perf/util/stat.h | 4 ++--
    2 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
    index 7bcc19b..197a2db 100644
    --- a/tools/perf/util/stat.c
    +++ b/tools/perf/util/stat.c
    @@ -100,15 +100,15 @@ struct perf_counts *perf_counts__new(int ncpus, int nthreads)
    struct perf_counts *counts = zalloc(sizeof(*counts));

    if (counts) {
    - struct xyarray *cpu;
    + struct xyarray *values;

    - cpu = xyarray__new(ncpus, nthreads, sizeof(struct perf_counts_values));
    - if (!cpu) {
    + values = xyarray__new(ncpus, nthreads, sizeof(struct perf_counts_values));
    + if (!values) {
    free(counts);
    return NULL;
    }

    - counts->cpu = cpu;
    + counts->values = values;
    }

    return counts;
    @@ -117,14 +117,14 @@ struct perf_counts *perf_counts__new(int ncpus, int nthreads)
    void perf_counts__delete(struct perf_counts *counts)
    {
    if (counts) {
    - xyarray__delete(counts->cpu);
    + xyarray__delete(counts->values);
    free(counts);
    }
    }

    static void perf_counts__reset(struct perf_counts *counts)
    {
    - xyarray__reset(counts->cpu);
    + xyarray__reset(counts->values);
    }

    void perf_evsel__reset_counts(struct perf_evsel *evsel)
    diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h
    index e0b8dc5..295d1e2 100644
    --- a/tools/perf/util/stat.h
    +++ b/tools/perf/util/stat.h
    @@ -46,13 +46,13 @@ struct perf_counts_values {
    struct perf_counts {
    s8 scaled;
    struct perf_counts_values aggr;
    - struct xyarray *cpu;
    + struct xyarray *values;
    };

    static inline struct perf_counts_values*
    perf_counts(struct perf_counts *counts, int cpu, int thread)
    {
    - return xyarray__entry(counts->cpu, cpu, thread);
    + return xyarray__entry(counts->values, cpu, thread);
    }

    void update_stats(struct stats *stats, u64 val);

    \
     
     \ /
      Last update: 2015-06-30 07:41    [W:4.501 / U:1.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site