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

igt_core: Read manpages more carefully for WNOHANG

Browse Source 
/me hides

I thought it said it would not return for a signal and stopped thinking.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2014-07-24 12:00:57 +01:00
parent 745945546f
commit 66e46630f8
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/igt_core.c
View File

@ -791,16 +791,24 @@ static void reset_helper_process_list(void)
helper_process_count = 0; helper_process_count = 0;
} }
static int __waitpid(pid_t pid)
{
int status = -1;
while (waitpid(pid, &status, 0) == -1 &&
errno == EINTR)
;
return status;
}
static void fork_helper_exit_handler(int sig) static void fork_helper_exit_handler(int sig)
{ {
int status;
/* Inside a signal handler, play safe */ /* Inside a signal handler, play safe */
for (int i = 0; i < ARRAY_SIZE(helper_process_pids); i++) { for (int i = 0; i < ARRAY_SIZE(helper_process_pids); i++) {
pid_t pid = helper_process_pids[i]; pid_t pid = helper_process_pids[i];
if (pid != -1) { if (pid != -1) {
kill(pid, SIGTERM); kill(pid, SIGTERM);
waitpid(pid, &status, WNOHANG); __waitpid(pid);
helper_process_count--; helper_process_count--;
} }
} }
@ -851,11 +859,11 @@ bool __igt_fork_helper(struct igt_helper_process *proc)
*/ */
int igt_wait_helper(struct igt_helper_process *proc) int igt_wait_helper(struct igt_helper_process *proc)
{ {
int status = -1; int status;
assert(proc->running); assert(proc->running);
waitpid(proc->pid, &status, WNOHANG); status = __waitpid(proc->pid);
proc->running = false; proc->running = false;