Queue freeing of GCHandles instead of freeing them immidiately

This commit is contained in:
Mads Kruse Johnsen 2020-11-19 16:48:29 +01:00
parent 06b88bdbc5
commit 41d6f0bf28

View file

@ -71,8 +71,12 @@ namespace GLib {
g_object_unref (handle); g_object_unref (handle);
else else
g_object_remove_toggle_ref (handle, ToggleNotifyCallback, (IntPtr) gch); g_object_remove_toggle_ref (handle, ToggleNotifyCallback, (IntPtr) gch);
reference = null; reference = null;
gch.Free ();
QueueGCHandleFree ();
handle = IntPtr.Zero;
} }
internal void Harden () internal void Harden ()
@ -97,7 +101,8 @@ namespace GLib {
reference = new WeakReference (reference); reference = new WeakReference (reference);
else if (!is_last_ref && reference is WeakReference) { else if (!is_last_ref && reference is WeakReference) {
WeakReference weak = reference as WeakReference; WeakReference weak = reference as WeakReference;
reference = weak.Target; if (weak.IsAlive)
reference = weak.Target;
} }
} }
@ -124,6 +129,37 @@ namespace GLib {
} }
} }
static List<GCHandle> PendingGCHandleFrees = new List<GCHandle> ();
static bool gc_idle_queued;
public void QueueGCHandleFree ()
{
lock (PendingGCHandleFrees) {
PendingGCHandleFrees.Add (gch);
if (!gc_idle_queued){
Timeout.Add (50, new TimeoutHandler (PerformGCHandleFrees));
gc_idle_queued = true;
}
}
}
static bool PerformGCHandleFrees ()
{
GCHandle[] handles;
lock (PendingGCHandleFrees){
handles = new GCHandle [PendingGCHandleFrees.Count];
PendingGCHandleFrees.CopyTo (handles, 0);
PendingGCHandleFrees.Clear ();
gc_idle_queued = false;
}
foreach (GCHandle r in handles)
r.Free ();
return false;
}
static List<ToggleRef> PendingDestroys = new List<ToggleRef> (); static List<ToggleRef> PendingDestroys = new List<ToggleRef> ();
static bool idle_queued; static bool idle_queued;