lkml.org 
[lkml]   [2019]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 084/107] libperf: Adopt xyarray class from perf
    Date
    From: Jiri Olsa <jolsa@kernel.org>

    Move the xyarray class from perf to libperf, because it's going to be
    used in both.

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: Michael Petlan <mpetlan@redhat.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: http://lkml.kernel.org/r/20190721112506.12306-58-jolsa@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/builtin-top.c | 1 -
    tools/perf/lib/Build | 1 +
    .../{util => lib/include/internal}/xyarray.h | 6 ++--
    tools/perf/lib/xyarray.c | 33 +++++++++++++++++++
    tools/perf/util/Build | 1 -
    tools/perf/util/counts.h | 2 +-
    tools/perf/util/evsel.h | 2 +-
    tools/perf/util/python-ext-sources | 1 -
    tools/perf/util/stat.h | 1 -
    9 files changed, 39 insertions(+), 9 deletions(-)
    rename tools/perf/{util => lib/include/internal}/xyarray.h (84%)
    create mode 100644 tools/perf/lib/xyarray.c

    diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
    index c69ddc67c672..1a4615a5f6c9 100644
    --- a/tools/perf/builtin-top.c
    +++ b/tools/perf/builtin-top.c
    @@ -38,7 +38,6 @@
    #include <subcmd/parse-options.h>
    #include "util/parse-events.h"
    #include "util/cpumap.h"
    -#include "util/xyarray.h"
    #include "util/sort.h"
    #include "util/string2.h"
    #include "util/term.h"
    diff --git a/tools/perf/lib/Build b/tools/perf/lib/Build
    index faf64db13e37..4f78ec0b4e10 100644
    --- a/tools/perf/lib/Build
    +++ b/tools/perf/lib/Build
    @@ -4,6 +4,7 @@ libperf-y += threadmap.o
    libperf-y += evsel.o
    libperf-y += evlist.o
    libperf-y += zalloc.o
    +libperf-y += xyarray.o

    $(OUTPUT)zalloc.o: ../../lib/zalloc.c FORCE
    $(call rule_mkdir)
    diff --git a/tools/perf/util/xyarray.h b/tools/perf/lib/include/internal/xyarray.h
    similarity index 84%
    rename from tools/perf/util/xyarray.h
    rename to tools/perf/lib/include/internal/xyarray.h
    index 7ffe562e7ae7..3bf70e4d474c 100644
    --- a/tools/perf/util/xyarray.h
    +++ b/tools/perf/lib/include/internal/xyarray.h
    @@ -1,6 +1,6 @@
    /* SPDX-License-Identifier: GPL-2.0 */
    -#ifndef _PERF_XYARRAY_H_
    -#define _PERF_XYARRAY_H_ 1
    +#ifndef __LIBPERF_INTERNAL_XYARRAY_H
    +#define __LIBPERF_INTERNAL_XYARRAY_H

    #include <sys/types.h>

    @@ -32,4 +32,4 @@ static inline int xyarray__max_x(struct xyarray *xy)
    return xy->max_x;
    }

    -#endif /* _PERF_XYARRAY_H_ */
    +#endif /* __LIBPERF_INTERNAL_XYARRAY_H */
    diff --git a/tools/perf/lib/xyarray.c b/tools/perf/lib/xyarray.c
    new file mode 100644
    index 000000000000..dcd901d154bb
    --- /dev/null
    +++ b/tools/perf/lib/xyarray.c
    @@ -0,0 +1,33 @@
    +// SPDX-License-Identifier: GPL-2.0
    +#include <internal/xyarray.h>
    +#include <linux/zalloc.h>
    +#include <stdlib.h>
    +#include <string.h>
    +
    +struct xyarray *xyarray__new(int xlen, int ylen, size_t entry_size)
    +{
    + size_t row_size = ylen * entry_size;
    + struct xyarray *xy = zalloc(sizeof(*xy) + xlen * row_size);
    +
    + if (xy != NULL) {
    + xy->entry_size = entry_size;
    + xy->row_size = row_size;
    + xy->entries = xlen * ylen;
    + xy->max_x = xlen;
    + xy->max_y = ylen;
    + }
    +
    + return xy;
    +}
    +
    +void xyarray__reset(struct xyarray *xy)
    +{
    + size_t n = xy->entries * xy->entry_size;
    +
    + memset(xy->contents, 0, n);
    +}
    +
    +void xyarray__delete(struct xyarray *xy)
    +{
    + free(xy);
    +}
    diff --git a/tools/perf/util/Build b/tools/perf/util/Build
    index 08f670d21615..7abf05131889 100644
    --- a/tools/perf/util/Build
    +++ b/tools/perf/util/Build
    @@ -69,7 +69,6 @@ perf-y += svghelper.o
    perf-y += sort.o
    perf-y += hist.o
    perf-y += util.o
    -perf-y += xyarray.o
    perf-y += cpumap.o
    perf-y += cputopo.o
    perf-y += cgroup.o
    diff --git a/tools/perf/util/counts.h b/tools/perf/util/counts.h
    index 0f0cb2d8f70d..bbfac9ecf642 100644
    --- a/tools/perf/util/counts.h
    +++ b/tools/perf/util/counts.h
    @@ -2,7 +2,7 @@
    #ifndef __PERF_COUNTS_H
    #define __PERF_COUNTS_H

    -#include "xyarray.h"
    +#include <internal/xyarray.h>

    struct perf_counts_values {
    union {
    diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
    index 57b5523b480c..1f9f66fe43f4 100644
    --- a/tools/perf/util/evsel.h
    +++ b/tools/perf/util/evsel.h
    @@ -8,7 +8,7 @@
    #include <linux/perf_event.h>
    #include <linux/types.h>
    #include <internal/evsel.h>
    -#include "xyarray.h"
    +#include <internal/xyarray.h>
    #include "symbol_conf.h"
    #include "cpumap.h"
    #include "counts.h"
    diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ext-sources
    index 2237bac9fadb..235bd9803390 100644
    --- a/tools/perf/util/python-ext-sources
    +++ b/tools/perf/util/python-ext-sources
    @@ -20,7 +20,6 @@ util/namespaces.c
    ../lib/vsprintf.c
    util/thread_map.c
    util/util.c
    -util/xyarray.c
    util/cgroup.c
    util/parse-branch-options.c
    util/rblist.c
    diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h
    index 95b4de7a9d51..bcb376e1b3a7 100644
    --- a/tools/perf/util/stat.h
    +++ b/tools/perf/util/stat.h
    @@ -8,7 +8,6 @@
    #include <sys/time.h>
    #include <sys/resource.h>
    #include <sys/wait.h>
    -#include "xyarray.h"
    #include "rblist.h"
    #include "perf.h"
    #include "event.h"
    --
    2.21.0
    \
     
     \ /
      Last update: 2019-07-30 05:09    [W:4.055 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site