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

compositor: clean up signal event sources on exit

Browse Source 
Fixes some Valgrind errors.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Pekka Paalanen
2012-01-02 16:03:26 +02:00
parent 0135abee89
commit 51c769f32e
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/compositor.c
+13 -4
View File
@@ -2068,6 +2068,7 @@ int main(int argc, char *argv[])
{ {
struct wl_display *display; struct wl_display *display;
struct wlsc_compositor *ec; struct wlsc_compositor *ec;
struct wl_event_source *signals[4];
struct wl_event_loop *loop; struct wl_event_loop *loop;
int o, xserver = 0; int o, xserver = 0;
void *shell_module, *backend_module; void *shell_module, *backend_module;
@@ -2079,6 +2080,7 @@ int main(int argc, char *argv[])
char *shell = NULL; char *shell = NULL;
char *p; char *p;
int option_idle_time = 300; int option_idle_time = 300;
int i;
static const char opts[] = "B:b:o:S:i:s:x"; static const char opts[] = "B:b:o:S:i:s:x";
static const struct option longopts[ ] = { static const struct option longopts[ ] = {
@@ -2123,12 +2125,16 @@ int main(int argc, char *argv[])
display = wl_display_create(); display = wl_display_create();
loop = wl_display_get_event_loop(display); loop = wl_display_get_event_loop(display);
wl_event_loop_add_signal(loop, SIGTERM, on_term_signal, display); signals[0] = wl_event_loop_add_signal(loop, SIGTERM, on_term_signal,
wl_event_loop_add_signal(loop, SIGINT, on_term_signal, display); display);
wl_event_loop_add_signal(loop, SIGQUIT, on_term_signal, display); signals[1] = wl_event_loop_add_signal(loop, SIGINT, on_term_signal,
display);
signals[2] = wl_event_loop_add_signal(loop, SIGQUIT, on_term_signal,
display);
wl_list_init(&child_process_list); wl_list_init(&child_process_list);
wl_event_loop_add_signal(loop, SIGCHLD, sigchld_handler, NULL); signals[3] = wl_event_loop_add_signal(loop, SIGCHLD, sigchld_handler,
NULL);
if (!backend) { if (!backend) {
if (getenv("WAYLAND_DISPLAY")) if (getenv("WAYLAND_DISPLAY"))
@@ -2185,6 +2191,9 @@ int main(int argc, char *argv[])
if (ec->has_bind_display) if (ec->has_bind_display)
ec->unbind_display(ec->display, display); ec->unbind_display(ec->display, display);
for (i = ARRAY_LENGTH(signals); i;)
wl_event_source_remove(signals[--i]);
ec->destroy(ec); ec->destroy(ec);
wl_display_destroy(display); wl_display_destroy(display);