AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

wayland: Fix memleaks when rendering with Cairo

Browse Source 
We were leaking buffers. This wasn't caught by valgrind and friends
because it was shared memory (with the compositor), but top(1) would
instantly see memory consumption of the app and the shell go through the
roof.
This commit is contained in:
Benjamin Otte 2021-03-09 19:52:59 +01:00
parent b63c4d6722
commit 0a9d075b47
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdk/wayland/gdkcairocontext-wayland.c
View File

@ -109,6 +109,8 @@ gdk_wayland_cairo_context_buffer_release (void *_data,
/* Get rid of all the extra ones */ /* Get rid of all the extra ones */
gdk_wayland_cairo_context_remove_surface (self, cairo_surface); gdk_wayland_cairo_context_remove_surface (self, cairo_surface);
/* Release the reference the compositor held to this surface */
cairo_surface_destroy (cairo_surface);
} }
static const struct wl_buffer_listener buffer_listener = { static const struct wl_buffer_listener buffer_listener = {
@ -194,7 +196,7 @@ gdk_wayland_cairo_context_end_frame (GdkDrawContext *draw_context,
static void static void
gdk_wayland_cairo_context_clear_all_cairo_surfaces (GdkWaylandCairoContext *self) gdk_wayland_cairo_context_clear_all_cairo_surfaces (GdkWaylandCairoContext *self)
{ {
self->cached_surface = NULL; g_clear_pointer (&self->cached_surface, cairo_surface_destroy);
while (self->surfaces) while (self->surfaces)
gdk_wayland_cairo_context_remove_surface (self, self->surfaces->data); gdk_wayland_cairo_context_remove_surface (self, self->surfaces->data);
} }
@ -221,6 +223,8 @@ gdk_wayland_cairo_context_dispose (GObject *object)
GdkWaylandCairoContext *self = GDK_WAYLAND_CAIRO_CONTEXT (object); GdkWaylandCairoContext *self = GDK_WAYLAND_CAIRO_CONTEXT (object);
gdk_wayland_cairo_context_clear_all_cairo_surfaces (self); gdk_wayland_cairo_context_clear_all_cairo_surfaces (self);
g_assert (self->cached_surface == NULL);
g_assert (self->paint_surface == NULL);
G_OBJECT_CLASS (gdk_wayland_cairo_context_parent_class)->dispose (object); G_OBJECT_CLASS (gdk_wayland_cairo_context_parent_class)->dispose (object);
} }