mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

frontend: Inline process_handle_sigchld 

Now that we have wet_process everywhere, print out the process exit
status in the main handler.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone 2023-05-01 15:36:06 +01:00
parent 9a7c88c2e9
commit 991b3fb2e0
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
compositor/main.c
View File

@ -360,6 +360,16 @@ sigchld_handler(int signal_number, void *data)
if (&p->link == &wet->child_process_list)
continue;
if (WIFEXITED(status)) {
weston_log("%s exited with status %d\n", p->path,
WEXITSTATUS(status));
} else if (WIFSIGNALED(status)) {
weston_log("%s died on signal %d\n", p->path,
WTERMSIG(status));
} else {
weston_log("%s disappeared\n", p->path);
}
wl_list_remove(&p->link);
if (p->cleanup)
p->cleanup(p, status, p->cleanup_data);
@ -465,25 +475,6 @@ wet_client_launch(struct weston_compositor *compositor,
return proc;
}
static void
process_handle_sigchld(struct wet_process *process, int status, void *data)
{
/*
* There are no guarantees whether this runs before or after
* the wl_client destructor.
*/
if (WIFEXITED(status)) {
weston_log("%s exited with status %d\n", process->path,
WEXITSTATUS(status));
} else if (WIFSIGNALED(status)) {
weston_log("%s died on signal %d\n", process->path,
WTERMSIG(status));
} else {
weston_log("%s disappeared\n", process->path);
}
}
WL_EXPORT struct wl_client *
wet_client_start(struct weston_compositor *compositor, const char *path)
{
@ -514,7 +505,7 @@ wet_client_start(struct weston_compositor *compositor, const char *path)
proc = wet_client_launch(compositor, &child_env,
no_cloexec_fds, num_no_cloexec_fds,
process_handle_sigchld, NULL);
NULL, NULL);
if (!proc)
return NULL;