callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace the autorelease pools used for each drawing context and in

Browse Source 
2007-12-10  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkdrawable-quartz.c:
	(gdk_quartz_drawable_get_context),
	(gdk_quartz_drawable_release_context):
	* gdk/quartz/gdkeventloop-quartz.c: (gdk_event_prepare),
	(gdk_event_check), (gdk_event_dispatch), (poll_func):
	* gdk/quartz/gdkwindow-quartz.h: Replace the autorelease pools
	used for each drawing context and in prepare, dispatch and poll
	with one that exists across each main loop iteration. Fixes leaks
	on leopard and protects against future leaks introduce when the
	underlying system changes again (bug #492977).

svn path=/trunk/; revision=19149
This commit is contained in:
Richard Hult
2007-12-10 20:22:08 +00:00
committed by Richard Hult
parent f4baa51f49
commit d7f3ab0569
4 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2007-12-10 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkdrawable-quartz.c:
(gdk_quartz_drawable_get_context),
(gdk_quartz_drawable_release_context):
* gdk/quartz/gdkeventloop-quartz.c: (gdk_event_prepare),
(gdk_event_check), (gdk_event_dispatch), (poll_func):
* gdk/quartz/gdkwindow-quartz.h: Replace the autorelease pools
used for each drawing context and in prepare, dispatch and poll
with one that exists across each main loop iteration. Fixes leaks
on leopard and protects against future leaks introduce when the
underlying system changes again (bug #492977).
2007-12-10 Richard Hult <richard@imendio.com> 2007-12-10 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkwindow-quartz.c: (move_resize_window_internal): * gdk/quartz/gdkwindow-quartz.c: (move_resize_window_internal):

18
gdk/quartz/gdkdrawable-quartz.c
View File

@ -687,14 +687,8 @@ gdk_quartz_drawable_get_context (GdkDrawable *drawable,
*/ */
if (window_impl->in_paint_rect_count == 0) if (window_impl->in_paint_rect_count == 0)
{ {
window_impl->pool = [[NSAutoreleasePool alloc] init];
if (![window_impl->view lockFocusIfCanDraw]) if (![window_impl->view lockFocusIfCanDraw])
{ return NULL;
[window_impl->pool release];
window_impl->pool = NULL;
return NULL;
}
} }
cg_context = [[NSGraphicsContext currentContext] graphicsPort]; cg_context = [[NSGraphicsContext currentContext] graphicsPort];
@ -767,15 +761,7 @@ gdk_quartz_drawable_release_context (GdkDrawable *drawable,
/* See comment in gdk_quartz_drawable_get_context(). */ /* See comment in gdk_quartz_drawable_get_context(). */
if (window_impl->in_paint_rect_count == 0) if (window_impl->in_paint_rect_count == 0)
{ [window_impl->view unlockFocus];
[window_impl->view unlockFocus];
if (window_impl->pool)
{
[window_impl->pool release];
window_impl->pool = NULL;
}
}
} }
else if (GDK_IS_PIXMAP_IMPL_QUARTZ (drawable)) else if (GDK_IS_PIXMAP_IMPL_QUARTZ (drawable))
CGContextRelease (cg_context); CGContextRelease (cg_context);

20
gdk/quartz/gdkeventloop-quartz.c
View File

@ -23,6 +23,7 @@ static GPollFD *pipe_pollfd;
static guint n_pollfds; static guint n_pollfds;
static CFRunLoopSourceRef select_main_thread_source; static CFRunLoopSourceRef select_main_thread_source;
static CFRunLoopRef main_thread_run_loop; static CFRunLoopRef main_thread_run_loop;
static NSAutoreleasePool *autorelease_pool;
gboolean gboolean
_gdk_quartz_event_loop_check_pending (void) _gdk_quartz_event_loop_check_pending (void)
@ -56,8 +57,6 @@ gdk_event_prepare (GSource *source,
GDK_THREADS_ENTER (); GDK_THREADS_ENTER ();
GDK_QUARTZ_ALLOC_POOL;
*timeout = -1; *timeout = -1;
event = [NSApp nextEventMatchingMask: NSAnyEventMask event = [NSApp nextEventMatchingMask: NSAnyEventMask
@ -68,8 +67,6 @@ gdk_event_prepare (GSource *source,
retval = (_gdk_event_queue_find_first (_gdk_display) != NULL || retval = (_gdk_event_queue_find_first (_gdk_display) != NULL ||
event != NULL); event != NULL);
GDK_QUARTZ_RELEASE_POOL;
GDK_THREADS_LEAVE (); GDK_THREADS_LEAVE ();
return retval; return retval;
@ -82,6 +79,10 @@ gdk_event_check (GSource *source)
GDK_THREADS_ENTER (); GDK_THREADS_ENTER ();
if (autorelease_pool)
[autorelease_pool release];
autorelease_pool = [[NSAutoreleasePool alloc] init];
if (_gdk_event_queue_find_first (_gdk_display) != NULL || if (_gdk_event_queue_find_first (_gdk_display) != NULL ||
_gdk_quartz_event_loop_check_pending ()) _gdk_quartz_event_loop_check_pending ())
retval = TRUE; retval = TRUE;
@ -102,8 +103,6 @@ gdk_event_dispatch (GSource *source,
GDK_THREADS_ENTER (); GDK_THREADS_ENTER ();
GDK_QUARTZ_ALLOC_POOL;
_gdk_events_queue (_gdk_display); _gdk_events_queue (_gdk_display);
event = _gdk_event_unqueue (_gdk_display); event = _gdk_event_unqueue (_gdk_display);
@ -116,8 +115,6 @@ gdk_event_dispatch (GSource *source,
gdk_event_free (event); gdk_event_free (event);
} }
GDK_QUARTZ_RELEASE_POOL;
GDK_THREADS_LEAVE (); GDK_THREADS_LEAVE ();
return TRUE; return TRUE;
@ -201,8 +198,6 @@ poll_func (GPollFD *ufds, guint nfds, gint timeout_)
int n_active = 0; int n_active = 0;
int i; int i;
GDK_QUARTZ_ALLOC_POOL;
if (nfds > 1) if (nfds > 1)
{ {
if (!select_thread) { if (!select_thread) {
@ -306,8 +301,6 @@ poll_func (GPollFD *ufds, guint nfds, gint timeout_)
n_active ++; n_active ++;
} }
GDK_QUARTZ_RELEASE_POOL;
return n_active; return n_active;
} }
@ -327,6 +320,7 @@ _gdk_quartz_event_loop_init (void)
old_poll_func = g_main_context_get_poll_func (NULL); old_poll_func = g_main_context_get_poll_func (NULL);
g_main_context_set_poll_func (NULL, poll_func); g_main_context_set_poll_func (NULL, poll_func);
autorelease_pool = [[NSAutoreleasePool alloc] init];
} }

5
gdk/quartz/gdkwindow-quartz.h
View File

@ -54,11 +54,6 @@ struct _GdkWindowImplQuartz
GdkWindowTypeHint type_hint; GdkWindowTypeHint type_hint;
/* This is the autorelease pool which is retained
* while the context is being held
*/
NSAutoreleasePool *pool;
NSCursor *nscursor; NSCursor *nscursor;
GdkRegion *paint_clip_region; GdkRegion *paint_clip_region;