flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-12 10:26:12 +00:00
Code Issues Releases Wiki Activity

lib/drmtest: Avoid calling exit handlers multiple times

Browse Source 
- reset the count when forking
- don't add the same handler multiple times
- don't restore the exit signal handlers in the forked helper
  process
- reset the exit handler count once called to make sure we don't call
  it multiple times when dying
- don't wait for the signal helper if it's gone already

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2013-09-08 14:03:03 +02:00
parent b3dadedd2e
commit fbd64de6be
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/drmtest.c
View File

@ -589,6 +589,8 @@ off_t prime_get_size(int dma_buf_fd)
/* signal interrupt helpers */ /* signal interrupt helpers */
static bool igt_only_list_subtests(void); static bool igt_only_list_subtests(void);
static int exit_handler_count;
static pid_t signal_helper = -1; static pid_t signal_helper = -1;
long long int sig_stat; long long int sig_stat;
static void __attribute__((noreturn)) signal_helper_process(pid_t pid) static void __attribute__((noreturn)) signal_helper_process(pid_t pid)
@ -624,11 +626,13 @@ void igt_fork_signal_helper(void)
signal(SIGUSR1, sig_handler); signal(SIGUSR1, sig_handler);
oldsig = signal(SIGQUIT, SIG_DFL); oldsig = signal(SIGQUIT, SIG_DFL);
pid = fork(); pid = fork();
signal(SIGQUIT, oldsig);
if (pid == 0) { if (pid == 0) {
exit_handler_count = 0;
signal_helper_process(getppid()); signal_helper_process(getppid());
return; return;
} }
signal(SIGQUIT, oldsig);
signal_helper = pid; signal_helper = pid;
} }
@ -640,6 +644,8 @@ void igt_stop_signal_helper(void)
if (signal_helper != -1) { if (signal_helper != -1) {
kill(signal_helper, SIGQUIT); kill(signal_helper, SIGQUIT);
wait(&exitcode); wait(&exitcode);
signal_helper = -1;
} else } else
return; return;
@ -988,6 +994,8 @@ bool __igt_fork(void)
igt_assert(0); igt_assert(0);
case 0: case 0:
test_child = true; test_child = true;
exit_handler_count = 0;
return true; return true;
default: default:
return false; return false;
@ -1629,7 +1637,6 @@ static struct {
} orig_sig[MAX_SIGNALS]; } orig_sig[MAX_SIGNALS];
static igt_exit_handler_t exit_handler_fn[MAX_EXIT_HANDLERS]; static igt_exit_handler_t exit_handler_fn[MAX_EXIT_HANDLERS];
static int exit_handler_count;
static bool exit_handler_disabled; static bool exit_handler_disabled;
static sigset_t saved_sig_mask; static sigset_t saved_sig_mask;
static const int handled_signals[] = static const int handled_signals[] =
@ -1672,6 +1679,9 @@ static void call_exit_handlers(int sig)
for (i = exit_handler_count - 1; i >= 0; i--) for (i = exit_handler_count - 1; i >= 0; i--)
exit_handler_fn[i](sig); exit_handler_fn[i](sig);
/* ensure we don't get called twice */
exit_handler_count = 0;
} }
static void igt_atexit_handler(void) static void igt_atexit_handler(void)
@ -1710,6 +1720,10 @@ int igt_install_exit_handler(igt_exit_handler_t fn)
{ {
int i; int i;
for (i = 0; i < exit_handler_count; i++)
if (exit_handler_fn[i] == fn)
return 0;
if (exit_handler_count == MAX_EXIT_HANDLERS) if (exit_handler_count == MAX_EXIT_HANDLERS)
return -1; return -1;