isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-02 04:40:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Clean up presentation-time state

Browse Source 
Fixes memory leak:

==995170== 288 (96 direct, 192 indirect) bytes in 1 blocks are definitely lost in loss record 14,607 of 15,641
==995170==    at 0x483F7B5: malloc (vg_replace_malloc.c:381)
==995170==    by 0x4B21178: g_malloc (gmem.c:125)
==995170==    by 0x4B395C0: g_slice_alloc (gslice.c:1072)
==995170==    by 0x4B0766D: g_hash_table_new_full (ghash.c:1071)
==995170==    by 0x4A4F973: meta_wayland_init_presentation_time (meta-wayland-presentation-time.c:222)
==995170==    by 0x4A3FB04: meta_wayland_compositor_new (meta-wayland.c:635)
==995170==    by 0x49C7FA7: meta_context_start (meta-context.c:412)
==995170==    by 0x10F065: main (mutter.c:148)

Fixes: dccc60ec3e ("wayland: Implement stub presentation-time")
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2527>
This commit is contained in:
Michel Dänzer 2022-07-23 17:00:09 +02:00 committed by Marge Bot
parent b329dce070
commit 806e64dcb0
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wayland/meta-wayland-presentation-time-private.h
View File

@ -49,6 +49,8 @@ typedef struct _MetaWaylandPresentationTime
GHashTable *feedbacks; GHashTable *feedbacks;
} MetaWaylandPresentationTime; } MetaWaylandPresentationTime;
void meta_wayland_presentation_time_finalize (MetaWaylandCompositor *compositor);
void meta_wayland_init_presentation_time (MetaWaylandCompositor *compositor); void meta_wayland_init_presentation_time (MetaWaylandCompositor *compositor);
void meta_wayland_presentation_feedback_discard (MetaWaylandPresentationFeedback *feedback); void meta_wayland_presentation_feedback_discard (MetaWaylandPresentationFeedback *feedback);

15
src/wayland/meta-wayland-presentation-time.c
View File

@ -209,6 +209,21 @@ on_monitors_changed (MetaMonitorManager *manager,
g_hash_table_remove_all (compositor->presentation_time.feedbacks); g_hash_table_remove_all (compositor->presentation_time.feedbacks);
} }
void
meta_wayland_presentation_time_finalize (MetaWaylandCompositor *compositor)
{
MetaBackend *backend = meta_context_get_backend (compositor->context);
MetaMonitorManager *monitor_manager =
meta_backend_get_monitor_manager (backend);
g_hash_table_destroy (compositor->presentation_time.feedbacks);
g_signal_handlers_disconnect_by_func (monitor_manager, on_monitors_changed,
compositor);
g_signal_handlers_disconnect_by_func (monitor_manager, on_after_paint,
compositor);
}
void void
meta_wayland_init_presentation_time (MetaWaylandCompositor *compositor) meta_wayland_init_presentation_time (MetaWaylandCompositor *compositor)
{ {

1
src/wayland/meta-wayland.c
View File

@ -449,6 +449,7 @@ meta_wayland_compositor_finalize (GObject *object)
ClutterActor *stage = meta_backend_get_stage (backend); ClutterActor *stage = meta_backend_get_stage (backend);
meta_wayland_activation_finalize (compositor); meta_wayland_activation_finalize (compositor);
meta_wayland_presentation_time_finalize (compositor);
g_hash_table_destroy (compositor->scheduled_surface_associations); g_hash_table_destroy (compositor->scheduled_surface_associations);