lib: add igt_set_timeout
PATCH 1/2 lib: add igt_set_timeout
Add a function to stop and fail a test after the specified number of seconds have elapsed.
--- lib/igt_core.c | 44 +++++++++++++++++++++++++++++++++++++++++--- lib/igt_core.h | 2 ++ 2 files changed, 43 insertions(+), 3 deletions(-)
lib/igt_core.c +41 -3
@@ -618,9 +618,12 @@ void igt_fail(int exitcode)if (test_child)exit (exitcode); -if (in_subtest) -exit_subtest ("FAIL" ); -else { +if (in_subtest) { +if (exitcode ==78 ) +exit_subtest ("TIMEOUT" ); +else +exit_subtest ("FAIL" ); + }else {assert (!test_with_subtests || in_fixture);if (in_fixture) {
@@ -1201,3 +1204,38 @@ void igt_vlog(enum igt_log_level level, const char *format, va_list args) }else vprintf (format, args); } + +static void igt_alarm_handler (int signal) +{ +/* subsequent tests are skipped */ + skip_subtests_henceforth =SKIP ; + +/* exit with status 78 to indicate timeout */ +igt_fail (78 ); +} + +/** +* igt_set_timeout: +* @seconds: seconds before timeout +* +* Stop the current test and skip any subsequent tests after the specified +* number of seconds have elapsed. The test will exit with "timeout" status +* (78). Any previous timer is cancelled and no timeout is scheduled if @seconds +* is zero. +* +*/ +void igt_set_timeout (unsigned int seconds) +{ +struct sigaction sa; + + sa.sa_handler = igt_alarm_handler; +sigemptyset (&sa.sa_mask); + sa.sa_flags =0 ; + +if (seconds ==0 ) +sigaction (SIGALRM ,NULL ,NULL ); +else +sigaction (SIGALRM , &sa,NULL ); + +alarm (seconds); +}
lib/igt_core.h +2 -0
@@ -465,4 +465,6 @@ extern enum igt_log_level igt_log_level; } while (0) +void igt_set_timeout(unsigned int timeout); +#endif /* IGT_CORE_H */
Signature · 1 line
1.9.0
PATCH 2/2 lib: set a timeout when reading crc values
--- lib/igt_debugfs.c | 3 +++ 1 file changed, 3 insertions(+)
lib/igt_debugfs.c +3 -0
@@ -459,7 +459,10 @@ static bool read_one_crc(igt_pipe_crc_t *pipe_crc, igt_crc_t *out)ssize_t bytes_read;char buf[pipe_crc->buffer_len]; +igt_set_timeout (5 ); bytes_read =read (pipe_crc->crc_fd, &buf, pipe_crc->line_len); +igt_set_timeout (0 ); + igt_assert_cmpint(bytes_read, ==, pipe_crc->line_len); buf[bytes_read] ='\0' ;
Signature · 1 line
1.9.0
Quoted 4 lines · Thomas Wood
Add a function to stop and fail a test after the specified number of seconds have elapsed.
Signed-off-by Thomas Wood <[email protected]>
Looks like a useful helper to have in any case. Both patches are:
Signature · 1 line
Damien
Quoted 82 lines
--- lib/igt_core.c | 44 +++++++++++++++++++++++++++++++++++++++++--- lib/igt_core.h | 2 ++ 2 files changed, 43 insertions(+), 3 deletions(-)lib/igt_core.c +41
-3@@ -618,9 +618,12 @@ void igt_fail(int exitcode)if (test_child)exit (exitcode); -if (in_subtest) -exit_subtest ("FAIL" ); -else { +if (in_subtest) { +if (exitcode ==78 ) +exit_subtest ("TIMEOUT" ); +else +exit_subtest ("FAIL" ); + }else {assert (!test_with_subtests || in_fixture);if (in_fixture) {@@ -1201,3 +1204,38 @@ void igt_vlog(enum igt_log_level level, const char *format, va_list args) }else vprintf (format, args); } + +static void igt_alarm_handler (int signal) +{ +/* subsequent tests are skipped */ + skip_subtests_henceforth =SKIP ; + +/* exit with status 78 to indicate timeout */ +igt_fail (78 ); +} + +/** +* igt_set_timeout: +* @seconds: seconds before timeout +* +* Stop the current test and skip any subsequent tests after the specified +* number of seconds have elapsed. The test will exit with "timeout" status +* (78). Any previous timer is cancelled and no timeout is scheduled if @seconds +* is zero. +* +*/ +void igt_set_timeout (unsigned int seconds) +{ +struct sigaction sa; + + sa.sa_handler = igt_alarm_handler; +sigemptyset (&sa.sa_mask); + sa.sa_flags =0 ; + +if (seconds ==0 ) +sigaction (SIGALRM ,NULL ,NULL ); +else +sigaction (SIGALRM , &sa,NULL ); + +alarm (seconds); +}lib/igt_core.h +2
-0@@ -465,4 +465,6 @@ extern enum igt_log_level igt_log_level; } while (0) +void igt_set_timeout(unsigned int timeout); +#endif /* IGT_CORE_H */ Signature · 6 lines
1.9.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
lib/igt_core.c void igt_fail(int exitcode)
Quoted 14 lines · Thomas Wood
Add a function to stop and fail a test after the specified number of seconds have elapsed.
Signed-off-by Thomas Wood <[email protected]>--- lib/igt_core.c | 44 +++++++++++++++++++++++++++++++++++++++++--- lib/igt_core.h | 2 ++ 2 files changed, 43 insertions(+), 3 deletions(-)lib/igt_core.c +0
-0@@ -618,9 +618,12 @@ void igt_fail(int exitcode)
Right above this is the igt_exitcode = exitcode assignment. I wonder whether we should upgrade a TIMEOUT to a FAIL if we run more than one subtest.
Quoted 17 lines
lib/igt_core.c +6
-3if (test_child)exit (exitcode); -if (in_subtest) -exit_subtest ("FAIL" ); -else { +if (in_subtest) { +if (exitcode ==78 ) +exit_subtest ("TIMEOUT" ); +else +exit_subtest ("FAIL" ); + }else {assert (!test_with_subtests || in_fixture);if (in_fixture) {@@ -1201,3 +1204,38 @@ void igt_vlog(enum igt_log_level level, const char *format, va_list args) }else
lib/igt_core.c void igt_vlog(enum igt_log_level level, const char *format, va_list args) · line 1214
Quoted 10 lines
lib/igt_core.c +8
-0vprintf (format, args); } + +static void igt_alarm_handler (int signal) +{ +/* subsequent tests are skipped */ + skip_subtests_henceforth =SKIP ; + +/* exit with status 78 to indicate timeout */ +igt_fail (78 );
Hm, I didn't notice that your piglit testcase encodes 78 as "timeout". Or I've forgotten about it again ;-) Iirc my first attempt didn't special-case exit codes beyond the 77 "skip", but this works. One useful thing though would be to add a bunch of #defines for these special values somewhere in a header, e.g.
#define IGT_EXIT_TIMEOUT 78
#define IGT_EXIT_SKIP 77
#define IGT_EXIT_SUCCESS 0
But this is a follow-up patch.
-Daniel
Quoted 45 lines
lib/igt_core.c +27
-0+} + +/** +* igt_set_timeout: +* @seconds: seconds before timeout +* +* Stop the current test and skip any subsequent tests after the specified +* number of seconds have elapsed. The test will exit with "timeout" status +* (78). Any previous timer is cancelled and no timeout is scheduled if @seconds +* is zero. +* +*/ +void igt_set_timeout (unsigned int seconds) +{ +struct sigaction sa; + + sa.sa_handler = igt_alarm_handler; +sigemptyset (&sa.sa_mask); + sa.sa_flags =0 ; + +if (seconds ==0 ) +sigaction (SIGALRM ,NULL ,NULL ); +else +sigaction (SIGALRM , &sa,NULL ); + +alarm (seconds); +}lib/igt_core.h +2
-0@@ -465,4 +465,6 @@ extern enum igt_log_level igt_log_level; } while (0) +void igt_set_timeout(unsigned int timeout); +#endif /* IGT_CORE_H */ Signature · 6 lines
1.9.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch