mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

frontend: Factor out wet_process_destroy

Browse Source 
Reuse the body of the process cleanup as a separate function.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone 2023-05-01 18:50:31 +01:00
parent 991b3fb2e0
commit d5bcc26078
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compositor/main.c
View File

@ -335,6 +335,16 @@ to_wet_compositor(struct weston_compositor *compositor)
return weston_compositor_get_user_data(compositor);
}
WL_EXPORT void
wet_process_destroy(struct wet_process *process, int status, bool call_cleanup)
{
wl_list_remove(&process->link);
if (call_cleanup && process->cleanup)
process->cleanup(process, status, process->cleanup_data);
free(process->path);
free(process);
}
static int
sigchld_handler(int signal_number, void *data)
{
@ -370,11 +380,7 @@ sigchld_handler(int signal_number, void *data)
weston_log("%s disappeared\n", p->path);
}
wl_list_remove(&p->link);
if (p->cleanup)
p->cleanup(p, status, p->cleanup_data);
free(p->path);
free(p);
wet_process_destroy(p, status, true);
}
if (pid < 0 && errno != ECHILD)

3
compositor/weston.h
View File

@ -62,6 +62,9 @@ wet_client_launch(struct weston_compositor *compositor,
struct wl_client *
wet_client_start(struct weston_compositor *compositor, const char *path);
void
wet_process_destroy(struct wet_process *process, int status, bool call_cleanup);
struct weston_config *
wet_get_config(struct weston_compositor *compositor);