Re: [PATCH 1/3] perf tests: Introduce iterator function for tests

[Jiri Olsa]

On Sat, Sep 05, 2015 at 08:02:20PM +0100, Matt Fleming wrote:
> From: Matt Fleming 
> 
> In preparation for introducing more arrays of tests, e.g. "arch tests"
> (architecture-specific tests), abstract the code to iterate over the
> list of tests into a helper function.
> 
> This way, code that uses a 'struct test' doesn't need to worry about
> how the tests are grouped together and changes to the list of tests
> doesn't require changes to the code using it.
> 
> Cc: Peter Zijlstra 
> Cc: Jiri Olsa 
> Cc: Arnaldo Carvalho de Melo 
> Signed-off-by: Matt Fleming 

Acked-by: Jiri Olsa 

thanks,
jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 1/3] perf tests: Introduce iterator function for tests

[Jiri Olsa]

On Sat, Sep 05, 2015 at 08:02:20PM +0100, Matt Fleming wrote:
> From: Matt Fleming 
> 
> In preparation for introducing more arrays of tests, e.g. "arch tests"
> (architecture-specific tests), abstract the code to iterate over the
> list of tests into a helper function.
> 
> This way, code that uses a 'struct test' doesn't need to worry about
> how the tests are grouped together and changes to the list of tests
> doesn't require changes to the code using it.
> 
> Cc: Peter Zijlstra 
> Cc: Jiri Olsa 
> Cc: Arnaldo Carvalho de Melo 
> Signed-off-by: Matt Fleming 

Acked-by: Jiri Olsa 

thanks,
jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 1/3] perf tests: Introduce iterator function for tests

[Matt Fleming]

From: Matt Fleming 

In preparation for introducing more arrays of tests, e.g. "arch tests"
(architecture-specific tests), abstract the code to iterate over the
list of tests into a helper function.

This way, code that uses a 'struct test' doesn't need to worry about
how the tests are grouped together and changes to the list of tests
doesn't require changes to the code using it.

Cc: Peter Zijlstra 
Cc: Jiri Olsa 
Cc: Arnaldo Carvalho de Melo 
Signed-off-by: Matt Fleming 
---
 tools/perf/tests/builtin-test.c | 32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 136cd934be66..8cf0601d1662 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -183,7 +183,7 @@ static struct test {
},
 };
 
-static bool perf_test__matches(int curr, int argc, const char *argv[])
+static bool perf_test__matches(struct test *test, int curr, int argc, const 
char *argv[])
 {
int i;
 
@@ -200,7 +200,7 @@ static bool perf_test__matches(int curr, int argc, const 
char *argv[])
continue;
}
 
-   if (strstr(tests[curr].desc, argv[i]))
+   if (strstr(test->desc, argv[i]))
return true;
}
 
@@ -237,27 +237,28 @@ static int run_test(struct test *test)
return err;
 }
 
+#define for_each_test(t)for (t = [0]; t->func; t++)
+
 static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist)
 {
+   struct test *t;
int i = 0;
int width = 0;
 
-   while (tests[i].func) {
-   int len = strlen(tests[i].desc);
+   for_each_test(t) {
+   int len = strlen(t->desc);
 
if (width < len)
width = len;
-   ++i;
}
 
-   i = 0;
-   while (tests[i].func) {
+   for_each_test(t) {
int curr = i++, err;
 
-   if (!perf_test__matches(curr, argc, argv))
+   if (!perf_test__matches(t, curr, argc, argv))
continue;
 
-   pr_info("%2d: %-*s:", i, width, tests[curr].desc);
+   pr_info("%2d: %-*s:", i, width, t->desc);
 
if (intlist__find(skiplist, i)) {
color_fprintf(stderr, PERF_COLOR_YELLOW, " Skip (user 
override)\n");
@@ -265,8 +266,8 @@ static int __cmd_test(int argc, const char *argv[], struct 
intlist *skiplist)
}
 
pr_debug("\n--- start ---\n");
-   err = run_test([curr]);
-   pr_debug(" end \n%s:", tests[curr].desc);
+   err = run_test(t);
+   pr_debug(" end \n%s:", t->desc);
 
switch (err) {
case TEST_OK:
@@ -287,15 +288,14 @@ static int __cmd_test(int argc, const char *argv[], 
struct intlist *skiplist)
 
 static int perf_test__list(int argc, const char **argv)
 {
+   struct test *t;
int i = 0;
 
-   while (tests[i].func) {
-   int curr = i++;
-
-   if (argc > 1 && !strstr(tests[curr].desc, argv[1]))
+   for_each_test(t) {
+   if (argc > 1 && !strstr(t->desc, argv[1]))
continue;
 
-   pr_info("%2d: %s\n", i, tests[curr].desc);
+   pr_info("%2d: %s\n", ++i, t->desc);
}
 
return 0;
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 1/3] perf tests: Introduce iterator function for tests

[Matt Fleming]

From: Matt Fleming 

In preparation for introducing more arrays of tests, e.g. "arch tests"
(architecture-specific tests), abstract the code to iterate over the
list of tests into a helper function.

This way, code that uses a 'struct test' doesn't need to worry about
how the tests are grouped together and changes to the list of tests
doesn't require changes to the code using it.

Cc: Peter Zijlstra 
Cc: Jiri Olsa 
Cc: Arnaldo Carvalho de Melo 
Signed-off-by: Matt Fleming 
---
 tools/perf/tests/builtin-test.c | 32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 136cd934be66..8cf0601d1662 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -183,7 +183,7 @@ static struct test {
},
 };
 
-static bool perf_test__matches(int curr, int argc, const char *argv[])
+static bool perf_test__matches(struct test *test, int curr, int argc, const 
char *argv[])
 {
int i;
 
@@ -200,7 +200,7 @@ static bool perf_test__matches(int curr, int argc, const 
char *argv[])
continue;
}
 
-   if (strstr(tests[curr].desc, argv[i]))
+   if (strstr(test->desc, argv[i]))
return true;
}
 
@@ -237,27 +237,28 @@ static int run_test(struct test *test)
return err;
 }
 
+#define for_each_test(t)for (t = [0]; t->func; t++)
+
 static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist)
 {
+   struct test *t;
int i = 0;
int width = 0;
 
-   while (tests[i].func) {
-   int len = strlen(tests[i].desc);
+   for_each_test(t) {
+   int len = strlen(t->desc);
 
if (width < len)
width = len;
-   ++i;
}
 
-   i = 0;
-   while (tests[i].func) {
+   for_each_test(t) {
int curr = i++, err;
 
-   if (!perf_test__matches(curr, argc, argv))
+   if (!perf_test__matches(t, curr, argc, argv))
continue;
 
-   pr_info("%2d: %-*s:", i, width, tests[curr].desc);
+   pr_info("%2d: %-*s:", i, width, t->desc);
 
if (intlist__find(skiplist, i)) {
color_fprintf(stderr, PERF_COLOR_YELLOW, " Skip (user 
override)\n");
@@ -265,8 +266,8 @@ static int __cmd_test(int argc, const char *argv[], struct 
intlist *skiplist)
}
 
pr_debug("\n--- start ---\n");
-   err = run_test([curr]);
-   pr_debug(" end \n%s:", tests[curr].desc);
+   err = run_test(t);
+   pr_debug(" end \n%s:", t->desc);
 
switch (err) {
case TEST_OK:
@@ -287,15 +288,14 @@ static int __cmd_test(int argc, const char *argv[], 
struct intlist *skiplist)
 
 static int perf_test__list(int argc, const char **argv)
 {
+   struct test *t;
int i = 0;
 
-   while (tests[i].func) {
-   int curr = i++;
-
-   if (argc > 1 && !strstr(tests[curr].desc, argv[1]))
+   for_each_test(t) {
+   if (argc > 1 && !strstr(t->desc, argv[1]))
continue;
 
-   pr_info("%2d: %s\n", i, tests[curr].desc);
+   pr_info("%2d: %s\n", ++i, t->desc);
}
 
return 0;
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/