Queue freeing of GCHandles instead of freeing them immidiately
This commit is contained in:
parent
06b88bdbc5
commit
41d6f0bf28
1 changed files with 38 additions and 2 deletions
|
@ -71,8 +71,12 @@ namespace GLib {
|
|||
g_object_unref (handle);
|
||||
else
|
||||
g_object_remove_toggle_ref (handle, ToggleNotifyCallback, (IntPtr) gch);
|
||||
|
||||
reference = null;
|
||||
gch.Free ();
|
||||
|
||||
QueueGCHandleFree ();
|
||||
|
||||
handle = IntPtr.Zero;
|
||||
}
|
||||
|
||||
internal void Harden ()
|
||||
|
@ -97,6 +101,7 @@ namespace GLib {
|
|||
reference = new WeakReference (reference);
|
||||
else if (!is_last_ref && reference is WeakReference) {
|
||||
WeakReference weak = reference as WeakReference;
|
||||
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 bool idle_queued;
|
||||
|
||||
|
|
Loading…
Reference in a new issue