brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogland: Fix crash when frame callback is destroyed before emitted

Browse Source 
If a frame callback is destroyed before it is invoked then the struct
would be freed but it would not be removed from the array of callbacks
so when cogland later tried to emit the callback it would crash. This
patch instead stores the callbacks in a GQueue with embedded list
nodes so that they can be removed from the list in the resource
destructor. That way it doesn't matter how the resource is destroyed,
it will still get removed from the list.

Reviewed-by: Robert Bragg <robert@linux.intel.com>
This commit is contained in:
Neil Roberts 2011-12-13 17:38:36 +00:00
parent d6b03ab45d
commit 9000f8330d
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
examples/cogland.c
View File

@ -79,7 +79,7 @@ struct _CoglandCompositor
int virtual_height; int virtual_height;
GList *outputs; GList *outputs;
GArray *frame_callbacks; GQueue frame_callbacks;
CoglPrimitive *triangle; CoglPrimitive *triangle;
@ -327,6 +327,12 @@ cogland_surface_damage (struct wl_client *client,
typedef struct _CoglandFrameCallback typedef struct _CoglandFrameCallback
{ {
/* GList node used as an embedded list */
GList node;
/* Pointer back to the compositor */
CoglandCompositor *compositor;
struct wl_resource resource; struct wl_resource resource;
} CoglandFrameCallback; } CoglandFrameCallback;
@ -335,6 +341,8 @@ destroy_frame_callback (struct wl_resource *callback_resource)
{ {
CoglandFrameCallback *callback = callback_resource->data; CoglandFrameCallback *callback = callback_resource->data;
g_queue_unlink (&callback->compositor->frame_callbacks,
&callback->node);
g_slice_free (CoglandFrameCallback, callback); g_slice_free (CoglandFrameCallback, callback);
} }
@ -347,6 +355,8 @@ cogland_surface_frame (struct wl_client *client,
CoglandSurface *surface = surface_resource->data; CoglandSurface *surface = surface_resource->data;
callback = g_slice_new0 (CoglandFrameCallback); callback = g_slice_new0 (CoglandFrameCallback);
callback->compositor = surface->compositor;
callback->node.data = callback;
callback->resource.object.interface = &wl_callback_interface; callback->resource.object.interface = &wl_callback_interface;
callback->resource.object.id = callback_id; callback->resource.object.id = callback_id;
callback->resource.destroy = destroy_frame_callback; callback->resource.destroy = destroy_frame_callback;
@ -354,7 +364,8 @@ cogland_surface_frame (struct wl_client *client,
wl_client_add_resource (client, &callback->resource); wl_client_add_resource (client, &callback->resource);
g_array_append_val (surface->compositor->frame_callbacks, callback); g_queue_push_tail_link (&surface->compositor->frame_callbacks,
&callback->node);
} }
const struct wl_surface_interface cogland_surface_interface = { const struct wl_surface_interface cogland_surface_interface = {
@ -494,7 +505,6 @@ paint_cb (void *user_data)
{ {
CoglandCompositor *compositor = user_data; CoglandCompositor *compositor = user_data;
GList *l; GList *l;
int i;
for (l = compositor->outputs; l; l = l->next) for (l = compositor->outputs; l; l = l->next)
{ {
@ -528,16 +538,15 @@ paint_cb (void *user_data)
cogl_pop_framebuffer (); cogl_pop_framebuffer ();
} }
for (i = 0; i < compositor->frame_callbacks->len; i++) while (!g_queue_is_empty (&compositor->frame_callbacks))
{ {
CoglandFrameCallback *callback = CoglandFrameCallback *callback =
g_array_index (compositor->frame_callbacks, CoglandFrameCallback *, i); g_queue_peek_head (&compositor->frame_callbacks);
wl_resource_post_event (&callback->resource, wl_resource_post_event (&callback->resource,
WL_CALLBACK_DONE, get_time ()); WL_CALLBACK_DONE, get_time ());
wl_resource_destroy (&callback->resource, 0); wl_resource_destroy (&callback->resource, 0);
} }
g_array_set_size (compositor->frame_callbacks, 0);
return TRUE; return TRUE;
} }
@ -703,7 +712,7 @@ main (int argc, char **argv)
if (compositor.wayland_display == NULL) if (compositor.wayland_display == NULL)
g_error ("failed to create wayland display"); g_error ("failed to create wayland display");
compositor.frame_callbacks = g_array_new (FALSE, FALSE, sizeof (void *)); g_queue_init (&compositor.frame_callbacks);
if (!wl_display_add_global (compositor.wayland_display, if (!wl_display_add_global (compositor.wayland_display,
&wl_compositor_interface, &wl_compositor_interface,