[tip:perf/core] perf tests: Spawn child for each test
Commit-ID: 0d8a5faaf5a1087c7212a6f0d81920a93396414a Gitweb: http://git.kernel.org/tip/0d8a5faaf5a1087c7212a6f0d81920a93396414a Author: Jiri Olsa AuthorDate: Sat, 10 May 2014 17:22:30 +0200 Committer: Jiri Olsa CommitDate: Thu, 12 Jun 2014 16:53:22 +0200 perf tests: Spawn child for each test In upcoming tests we will setup process limits, which might affect other tests. Spawning child for each test to prevent this. Acked-by: Namhyung Kim Cc: Arnaldo Carvalho de Melo Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Jean Pihet Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Reviewed-by: David Ahern Link: http://lkml.kernel.org/r/1401892622-30848-11-git-send-email-jo...@kernel.org Signed-off-by: Jiri Olsa --- tools/perf/tests/builtin-test.c | 32 +++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index 802e3cd..9677a5c 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -3,6 +3,8 @@ * * Builtin regression testing command: ever growing number of sanity tests */ +#include +#include #include "builtin.h" #include "intlist.h" #include "tests.h" @@ -172,6 +174,34 @@ static bool perf_test__matches(int curr, int argc, const char *argv[]) return false; } +static int run_test(struct test *test) +{ + int status, err = -1, child = fork(); + + if (child < 0) { + pr_err("failed to fork test: %s\n", strerror(errno)); + return -1; + } + + if (!child) { + pr_debug("test child forked, pid %d\n", getpid()); + err = test->func(); + exit(err); + } + + wait(); + + if (WIFEXITED(status)) { + err = WEXITSTATUS(status); + pr_debug("test child finished with %d\n", err); + } else if (WIFSIGNALED(status)) { + err = -1; + pr_debug("test child interrupted\n"); + } + + return err; +} + static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist) { int i = 0; @@ -200,7 +230,7 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist) } pr_debug("\n--- start ---\n"); - err = tests[curr].func(); + err = run_test([curr]); pr_debug(" end \n%s:", tests[curr].desc); switch (err) { -- 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/
[tip:perf/core] perf tests: Spawn child for each test
Commit-ID: 0d8a5faaf5a1087c7212a6f0d81920a93396414a Gitweb: http://git.kernel.org/tip/0d8a5faaf5a1087c7212a6f0d81920a93396414a Author: Jiri Olsa jo...@kernel.org AuthorDate: Sat, 10 May 2014 17:22:30 +0200 Committer: Jiri Olsa jo...@kernel.org CommitDate: Thu, 12 Jun 2014 16:53:22 +0200 perf tests: Spawn child for each test In upcoming tests we will setup process limits, which might affect other tests. Spawning child for each test to prevent this. Acked-by: Namhyung Kim namhy...@kernel.org Cc: Arnaldo Carvalho de Melo a...@kernel.org Cc: Corey Ashford cjash...@linux.vnet.ibm.com Cc: David Ahern dsah...@gmail.com Cc: Frederic Weisbecker fweis...@gmail.com Cc: Ingo Molnar mi...@kernel.org Cc: Jean Pihet jean.pi...@linaro.org Cc: Namhyung Kim namhy...@kernel.org Cc: Paul Mackerras pau...@samba.org Cc: Peter Zijlstra a.p.zijls...@chello.nl Reviewed-by: David Ahern dsah...@gmail.com Link: http://lkml.kernel.org/r/1401892622-30848-11-git-send-email-jo...@kernel.org Signed-off-by: Jiri Olsa jo...@kernel.org --- tools/perf/tests/builtin-test.c | 32 +++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index 802e3cd..9677a5c 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -3,6 +3,8 @@ * * Builtin regression testing command: ever growing number of sanity tests */ +#include unistd.h +#include string.h #include builtin.h #include intlist.h #include tests.h @@ -172,6 +174,34 @@ static bool perf_test__matches(int curr, int argc, const char *argv[]) return false; } +static int run_test(struct test *test) +{ + int status, err = -1, child = fork(); + + if (child 0) { + pr_err(failed to fork test: %s\n, strerror(errno)); + return -1; + } + + if (!child) { + pr_debug(test child forked, pid %d\n, getpid()); + err = test-func(); + exit(err); + } + + wait(status); + + if (WIFEXITED(status)) { + err = WEXITSTATUS(status); + pr_debug(test child finished with %d\n, err); + } else if (WIFSIGNALED(status)) { + err = -1; + pr_debug(test child interrupted\n); + } + + return err; +} + static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist) { int i = 0; @@ -200,7 +230,7 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist) } pr_debug(\n--- start ---\n); - err = tests[curr].func(); + err = run_test(tests[curr]); pr_debug( end \n%s:, tests[curr].desc); switch (err) { -- 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/