Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-11 13:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

libperf: Adopt xyarray class from perf

Browse Source 
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>
This commit is contained in:
Jiri Olsa 2019-07-21 13:24:44 +02:00 committed by Arnaldo Carvalho de Melo
parent 453fa03090
commit 4b247fa731
9 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/perf/builtin-top.c
View File

@ -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"

1
tools/perf/lib/Build
View File

@ -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)

6
tools/perf/util/xyarray.h → tools/perf/lib/include/internal/xyarray.h
View File

@ -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 */

33
tools/perf/lib/xyarray.c Normal file
View File

@ -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);
}

1
tools/perf/util/Build
View File

@ -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

2
tools/perf/util/counts.h
View File

@ -2,7 +2,7 @@
#ifndef __PERF_COUNTS_H
#define __PERF_COUNTS_H
#include "xyarray.h"
#include <internal/xyarray.h>
struct perf_counts_values {
union {

2
tools/perf/util/evsel.h
View File

@ -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"

1
tools/perf/util/python-ext-sources
View File

@ -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

1
tools/perf/util/stat.h
View File

@ -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"