openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf tests: Introduce iterator function for tests 

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.

Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Kanaka Juvva <kanaka.d.juvva@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Vikas Shivappa <vikas.shivappa@intel.com>
Cc: Vince Weaver <vince@deater.net>
Link: http://lkml.kernel.org/r/1441479742-15402-2-git-send-email-matt@codeblueprint.co.uk
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Matt Fleming 2015-09-05 20:02:20 +01:00 committed by Arnaldo Carvalho de Melo
parent c84974ed9f
commit e8210cefb7
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tools/perf/tests/builtin-test.c
View File

@ -195,7 +195,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;
@ -212,7 +212,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;
}
@ -249,27 +249,28 @@ static int run_test(struct test *test)
return err;
}
#define for_each_test(t) for (t = &tests[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");
@ -277,8 +278,8 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist)
}
pr_debug("\n--- start ---\n");
err = run_test(&tests[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:
@ -299,15 +300,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;