[PATCH wayland] Added a destroy signal to the wl_display object

[Jason Ekstrand]

Added a destroy signal to the wl_display object.

Signed-off by: Jason Ekstrand <ja...@jlekstrand.net>
---
This makes it easier to avoid memory leaks when writing wrappers
around wl_global objects.
This shouldn't break ABI, so it would be nice if it could make it into 1.0.4.

 src/wayland-server.c | 20 ++++++++++++++++++++
 src/wayland-server.h |  5 +++++
 2 files changed, 25 insertions(+)

diff --git a/src/wayland-server.c b/src/wayland-server.c
index f7f4c14..3fdbfb1 100644
--- a/src/wayland-server.c
+++ b/src/wayland-server.c
@@ -90,6 +90,8 @@ struct wl_display {
        struct wl_list global_list;
        struct wl_list socket_list;
        struct wl_list client_list;
+
+    struct wl_signal destroy_signal;
 };

 struct wl_global {
@@ -1096,6 +1098,8 @@ wl_display_create(void)
        wl_list_init(&display->client_list);
        wl_list_init(&display->registry_resource_list);

+    wl_signal_init(&display->destroy_signal);
+
        display->id = 1;
        display->serial = 0;

@@ -1115,6 +1119,8 @@ wl_display_destroy(struct wl_display *display)
        struct wl_socket *s, *next;
        struct wl_global *global, *gnext;

+    wl_signal_emit(&display->destroy_signal, display);
+
        wl_list_for_each_safe(s, next, &display->socket_list, link) {
                wl_event_source_remove(s->source);
                unlink(s->addr.sun_path);
@@ -1381,6 +1387,20 @@ wl_display_add_socket(struct wl_display
*display, const char *name)
        return 0;
 }

+WL_EXPORT void
+wl_display_add_destroy_listener(struct wl_display * display,
+            struct wl_listener * listener)
+{
+    wl_signal_add(&display->destroy_signal, listener);
+}
+
+WL_EXPORT struct wl_listener *
+wl_display_get_destroy_listener(struct wl_display * display,
+            wl_notify_func_t notify)
+{
+       return wl_signal_get(&display->destroy_signal, notify);
+}
+
 WL_EXPORT struct wl_resource *
 wl_client_add_object(struct wl_client *client,
                     const struct wl_interface *interface,
diff --git a/src/wayland-server.h b/src/wayland-server.h
index 3357105..9497fe0 100644
--- a/src/wayland-server.h
+++ b/src/wayland-server.h
@@ -106,6 +106,11 @@ void wl_display_remove_global(struct wl_display *display,
 uint32_t wl_display_get_serial(struct wl_display *display);
 uint32_t wl_display_next_serial(struct wl_display *display);

+void wl_display_add_destroy_listener(struct wl_display * display,
+                    struct wl_listener * listener);
+struct wl_listener *wl_display_get_destroy_listener(
+                    struct wl_display * display, wl_notify_func_t notify);
+
 struct wl_client *wl_client_create(struct wl_display *display, int fd);
 void wl_client_destroy(struct wl_client *client);
 void wl_client_flush(struct wl_client *client);
-- 
1.8.0.1
_______________________________________________
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel