Adding xyarray__for_each define to allow sequentially traverse xyarrays. It will be handy in following patch.
Cc: Adrian Hunter <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Corey Ashford <[email protected]> Cc: David Ahern <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Jean Pihet <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Signed-off-by: Jiri Olsa <[email protected]> --- tools/perf/Makefile.perf | 1 + tools/perf/tests/builtin-test.c | 4 ++++ tools/perf/tests/tests.h | 1 + tools/perf/tests/xyarray.c | 33 +++++++++++++++++++++++++++++++++ tools/perf/util/xyarray.c | 4 +++- tools/perf/util/xyarray.h | 6 ++++++ 6 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 tools/perf/tests/xyarray.c diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 69d90285a994..0b478a372494 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -428,6 +428,7 @@ endif LIB_OBJS += $(OUTPUT)tests/mmap-thread-lookup.o LIB_OBJS += $(OUTPUT)tests/thread-mg-share.o LIB_OBJS += $(OUTPUT)tests/poller.o +LIB_OBJS += $(OUTPUT)tests/xyarray.o BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o BUILTIN_OBJS += $(OUTPUT)builtin-bench.o diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index e2e3827ebd17..2da8c86599cd 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -158,6 +158,10 @@ static struct test { .func = test__poller, }, { + .desc = "Test xyarray", + .func = test__xyarray, + }, + { .func = NULL, }, }; diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index e2a76d509644..7b726578ff0d 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -49,6 +49,7 @@ int test__thread_mg_share(void); int test__hists_output(void); int test__hists_cumulate(void); int test__poller(void); +int test__xyarray(void); #if defined(__x86_64__) || defined(__i386__) || defined(__arm__) #ifdef HAVE_DWARF_UNWIND_SUPPORT diff --git a/tools/perf/tests/xyarray.c b/tools/perf/tests/xyarray.c new file mode 100644 index 000000000000..e1a1d6a45106 --- /dev/null +++ b/tools/perf/tests/xyarray.c @@ -0,0 +1,33 @@ +#include "tests.h" +#include "xyarray.h" +#include "debug.h" + +struct krava { + int a; +}; + +#define X 100 +#define Y 100 + +int test__xyarray(void) +{ + struct xyarray *a; + struct krava *k; + int x, y; + + a = xyarray__new(X, Y, sizeof(struct krava)); + TEST_ASSERT_VAL("failed to allocate xyarray", a); + + for (x = 0; x < X; x++) { + for (y = 0; y < Y; y++) { + k = xyarray__entry(a, x, y); + k->a = x * X + y; + } + } + + y = 0; + xyarray__for_each(a, k) + TEST_ASSERT_VAL("wrong array value", k->a == y++); + + return 0; +} diff --git a/tools/perf/util/xyarray.c b/tools/perf/util/xyarray.c index 22afbf6c536a..077e8240fe98 100644 --- a/tools/perf/util/xyarray.c +++ b/tools/perf/util/xyarray.c @@ -4,11 +4,13 @@ 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); + size_t size = xlen * row_size; + struct xyarray *xy = zalloc(sizeof(*xy) + size); if (xy != NULL) { xy->entry_size = entry_size; xy->row_size = row_size; + xy->size = size; } return xy; diff --git a/tools/perf/util/xyarray.h b/tools/perf/util/xyarray.h index c488a07275dd..e4efa075fd76 100644 --- a/tools/perf/util/xyarray.h +++ b/tools/perf/util/xyarray.h @@ -6,6 +6,7 @@ struct xyarray { size_t row_size; size_t entry_size; + size_t size; char contents[]; }; @@ -17,4 +18,9 @@ static inline void *xyarray__entry(struct xyarray *xy, int x, int y) return &xy->contents[x * xy->row_size + y * xy->entry_size]; } +#define xyarray__for_each(array, entry) \ + for (entry = (void *) &array->contents[0]; \ + (void *) entry < ((void *) array->contents + array->size); \ + entry++) + #endif /* _PERF_XYARRAY_H_ */ -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
