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

test-runner: Use l_main_run_with_signal instead of open coding it

Browse Source
This commit is contained in:
Marcel Holtmann 2018-11-01 20:46:18 +01:00
parent 0689877858
commit 2b36727f3a
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/test-runner.c
View File

@ -32,7 +32,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <signal.h>
#include <string.h> #include <string.h>
#include <getopt.h> #include <getopt.h>
#include <poll.h> #include <poll.h>
@ -1470,8 +1469,7 @@ static void test_timeout_timer_tick(struct l_timeout *timeout, void *user_data)
l_main_quit(); l_main_quit();
} }
static void test_timeout_signal_handler(struct l_signal *signal, uint32_t signo, static void test_timeout_signal_handler(uint32_t signo, void *user_data)
void *user_data)
{ {
switch (signo) { switch (signo) {
case SIGINT: case SIGINT:
@ -1484,8 +1482,6 @@ static void test_timeout_signal_handler(struct l_signal *signal, uint32_t signo,
static pid_t start_execution_timeout_timer(unsigned int max_exec_interval_sec, static pid_t start_execution_timeout_timer(unsigned int max_exec_interval_sec,
pid_t *test_exec_pid) pid_t *test_exec_pid)
{ {
sigset_t mask;
struct l_signal *signal;
struct l_timeout *test_exec_timeout; struct l_timeout *test_exec_timeout;
pid_t test_timer_pid; pid_t test_timer_pid;
@ -1499,22 +1495,15 @@ static pid_t start_execution_timeout_timer(unsigned int max_exec_interval_sec,
if (!l_main_init()) if (!l_main_init())
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
sigemptyset(&mask);
sigaddset(&mask, SIGINT);
sigaddset(&mask, SIGTERM);
signal = l_signal_create(&mask, test_timeout_signal_handler,
test_exec_pid, NULL);
test_exec_timeout = test_exec_timeout =
l_timeout_create(max_exec_interval_sec, l_timeout_create(max_exec_interval_sec,
test_timeout_timer_tick, test_timeout_timer_tick,
test_exec_pid, test_exec_pid,
NULL); NULL);
l_main_run(); l_main_run_with_signal(test_timeout_signal_handler, NULL);
l_timeout_remove(test_exec_timeout); l_timeout_remove(test_exec_timeout);
l_signal_remove(signal);
l_main_exit(); l_main_exit();