Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 06:29:23 +01:00
Code Releases Activity

t-runner: Refactor exec. timeout starting code

Browse Source
This commit is contained in:
Tim Kourt 2016-05-04 16:14:41 -07:00 committed by Denis Kenzior
parent d9744f3824
commit 16e997c424
1 changed files with 47 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
tools/test-runner.c
View File

@ -1030,50 +1030,73 @@ static void print_test_status(char *test_name, enum test_status ts,
l_free(interval_str); l_free(interval_str);
} }
static void exec_tmr_hndl(struct l_timeout *timeout, void *user_data) static void test_timeout_timer_tick(struct l_timeout *timeout, void *user_data)
{ {
pid_t *test_exec_pid = (pid_t *) user_data; pid_t *test_exec_pid = (pid_t *) user_data;
kill(*test_exec_pid, SIGKILL); kill_process(*test_exec_pid);
l_main_quit(); l_main_quit();
} }
static void exec_tmr_destroy_hndl(void *user_data)
{
l_main_quit();
}
static void signal_handler(struct l_signal *signal, uint32_t signo, static void signal_handler(struct l_signal *signal, uint32_t signo,
void *user_data) void *user_data)
{ {
switch (signo) { switch (signo) {
case SIGINT: case SIGINT:
case SIGTERM: case SIGTERM:
case SIGKILL:
l_main_quit(); l_main_quit();
break; break;
} }
} }
static void run_py_tests(char *config_dir_path, struct l_queue *test_queue) static pid_t start_execution_timeout_timer(pid_t *test_exec_pid)
{ {
sigset_t mask; sigset_t mask;
char *argv[3], *envp[3]; struct l_signal *signal;
int pos = 0;
pid_t test_exec_pid;
struct timeval time_before, time_after, time_elapsed;
struct l_timeout *test_exec_timeout; struct l_timeout *test_exec_timeout;
pid_t test_timer_pid;
test_timer_pid = fork();
if (test_timer_pid < 0) {
l_error("Failed to fork new process");
return -1;
}
if (test_timer_pid == 0) {
sigemptyset(&mask);
sigaddset(&mask, SIGINT);
sigaddset(&mask, SIGTERM);
signal = l_signal_create(&mask, signal_handler,
test_exec_pid, NULL);
test_exec_timeout =
l_timeout_create(TEST_MAX_EXEC_TIME_SEC,
test_timeout_timer_tick,
test_exec_pid,
NULL);
l_main_run();
l_timeout_remove(test_exec_timeout);
l_signal_remove(signal);
exit(EXIT_SUCCESS);
}
return test_timer_pid;
}
static void run_py_tests(char *config_dir_path, struct l_queue *test_queue)
{
char *argv[3];
pid_t test_exec_pid, test_timer_pid;
struct timeval time_before, time_after, time_elapsed;
char *py_test = NULL; char *py_test = NULL;
if (!config_dir_path) if (!config_dir_path)
return; return;
sigemptyset(&mask);
sigaddset(&mask, SIGINT);
sigaddset(&mask, SIGTERM);
sigaddset(&mask, SIGKILL);
if (chdir(config_dir_path) < 0) if (chdir(config_dir_path) < 0)
l_error("Failed to change directory\n"); l_error("Failed to change directory\n");
else { else {
@ -1096,57 +1119,12 @@ start_next_test:
argv[1] = py_test; argv[1] = py_test;
argv[2] = NULL; argv[2] = NULL;
pos = 0; print_test_status(py_test, TEST_STATUS_STARTED, 0);
envp[pos++] = "TERM=linux"; test_exec_pid = execute_program(argv, false);
if (config_dir_path)
envp[pos++] = (char *) config_dir_path;
envp[pos] = NULL;
test_exec_pid = fork(); gettimeofday(&time_before, NULL);
if (test_exec_pid < 0) {
l_error("Failed to fork new process");
return;
}
if (test_exec_pid == 0) { test_timer_pid = start_execution_timeout_timer(&test_exec_pid);
print_test_status(py_test, TEST_STATUS_STARTED, 0);
set_output_visibility();
execve(argv[0], argv, envp);
exit(EXIT_SUCCESS);
} else {
pid_t test_timer_pid;
gettimeofday(&time_before, NULL);
test_timer_pid = fork();
if (test_timer_pid < 0) {
l_error("Failed to fork new process");
return;
}
if (test_timer_pid == 0) {
struct l_signal *signal;
signal = l_signal_create(&mask, signal_handler, NULL,
NULL);
test_exec_timeout =
l_timeout_create(TEST_MAX_EXEC_TIME_SEC,
exec_tmr_hndl,
&test_exec_pid,
exec_tmr_destroy_hndl);
l_main_run();
l_timeout_remove(test_exec_timeout);
l_signal_remove(signal);
exit(EXIT_SUCCESS);
}
}
while (true) { while (true) {
pid_t corpse; pid_t corpse;
@ -1163,6 +1141,8 @@ start_next_test:
if (test_exec_pid == corpse) { if (test_exec_pid == corpse) {
gettimeofday(&time_after, NULL); gettimeofday(&time_after, NULL);
kill_process(test_timer_pid);
timersub(&time_after, &time_before, &time_elapsed); timersub(&time_after, &time_before, &time_elapsed);
sprintf(interval_buf, "%ld.%0ld", sprintf(interval_buf, "%ld.%0ld",
(long int) time_elapsed.tv_sec, (long int) time_elapsed.tv_sec,