diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-08-29 10:06:51 +0200 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-08-29 18:18:33 +0200 |
commit | cd1f220847c34610ab9e07c3cf1c5a7e77284eb8 (patch) | |
tree | 8c3f54af9c7b7303d03157f26c4c51413224394c /lib/drmtest.c | |
parent | 90a25055e3ec7d9779663bec9cbae93187671bfd (diff) |
lib/drmtest: extract igt_fork from gem_concurrent_blt
Making sure that we correctly collect the exit codes from all children
is a bit a hassle. So add another magic igt codeblock for easy forking
and joining.
Note that children are (currently at least) not allowed to call igt_skip.
Add an assert to enforce this.
v2:
- Properly propagate the exit code.
- Fix the segfault.
- Add a child int and num_children paramter to the magic codeblock as
suggested by Chris Wilson.
- Don't dump noise into stdout when a child thread fails, the parent
will do that for us already.
v3: Now with some docs.
v4: Fixup igt_waitchildren to properly reset state so it can be used
again.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'lib/drmtest.c')
-rw-r--r-- | lib/drmtest.c | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/lib/drmtest.c b/lib/drmtest.c index 70483eac..81c5fca9 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -652,6 +652,12 @@ static enum { CONT = 0, SKIP, FAIL } skip_subtests_henceforth = CONT; +/* fork support state */ +pid_t *test_children; +int num_test_children; +int test_children_sz; +bool test_child; + bool __igt_fixture(void) { assert(!in_fixture); @@ -852,6 +858,8 @@ void igt_skip(const char *f, ...) va_list args; skipped_one = true; + assert(!test_child); + if (!igt_only_list_subtests()) { va_start(args, f); vprintf(f, args); @@ -893,6 +901,10 @@ void igt_fail(int exitcode) failed_one = true; + /* Silent exit, parent will do the yelling. */ + if (test_child) + exit(exitcode); + if (in_subtest) exit_subtest("FAIL"); else { @@ -946,6 +958,59 @@ void igt_exit(void) exit(77); } +bool __igt_fork(void) +{ + assert(!test_with_subtests || in_subtest); + + if (num_test_children >= test_children_sz) { + if (!test_children_sz) + test_children_sz = 4; + else + test_children_sz *= 2; + + test_children = realloc(test_children, + sizeof(pid_t)*test_children_sz); + igt_assert(test_children); + } + + switch (test_children[num_test_children++] = fork()) { + case -1: + igt_assert(0); + case 0: + test_child = true; + return true; + default: + return false; + } + +} + +/** + * igt_waitchildren - wait for all children forked with igt_fork + * + * The magic here is that exit codes from children will be correctly propagated + */ +void igt_waitchildren(void) +{ + assert(!test_child); + + for (int nc = 0; nc < num_test_children; nc++) { + int status = -1; + while (waitpid(test_children[nc], &status, 0) == -1 && + errno == -EINTR) + ; + + if (status != 0) { + if (WIFEXITED(status)) + igt_fail(WEXITSTATUS(status)); + else + abort(); + } + } + + num_test_children = 0; +} + static bool env_set(const char *env_var, bool default_value) { char *val; |