ryujinx/GtkSharp
1
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2025-05-02 01:16:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

2008-02-21 Mike Kestner <mkestner@novell.com>

Browse source 
* glib/Source.cs: rework proxy removal to avoid boxing profile.
	* glib/Idle.cs: save src_id in proxy to facilitate removal.
	* glib/Timeout.cs: save src_id in proxy to facilitate removal.
	[Fixes #359561]

svn path=/trunk/gtk-sharp/; revision=96363
This commit is contained in:
Mike Kestner 2008-02-21 16:32:03 +00:00
parent 4c6671c625
commit c949e6e8de
4 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2008-02-21 Mike Kestner <mkestner@novell.com>
* glib/Source.cs: rework proxy removal to avoid boxing profile.
* glib/Idle.cs: save src_id in proxy to facilitate removal.
* glib/Timeout.cs: save src_id in proxy to facilitate removal.
[Fixes #359561]
2008-02-07 Mike Kestner <mkestner@novell.com>
* generator/ReturnValue.cs: null term array marshaling.
* glib/Marshaller.cs: new marshalers for null-terminated string
arrays. [Fixes #342113]
2008-02-07 Mike Kestner <mkestner@novell.com> 2008-02-07 Mike Kestner <mkestner@novell.com>
* generator/Parameters.cs: fix off-by-1 in null term array marshaling. * generator/Parameters.cs: fix off-by-1 in null term array marshaling.

6
glib/Idle.cs
View file

@ -68,11 +68,11 @@ namespace GLib {
public static uint Add (IdleHandler hndlr) public static uint Add (IdleHandler hndlr)
{ {
IdleProxy p = new IdleProxy (hndlr); IdleProxy p = new IdleProxy (hndlr);
uint code = g_idle_add ((IdleHandlerInternal) p.proxy_handler, IntPtr.Zero); p.ID = g_idle_add ((IdleHandlerInternal) p.proxy_handler, IntPtr.Zero);
lock (Source.source_handlers) lock (Source.source_handlers)
Source.source_handlers [code] = p; Source.source_handlers [p.ID] = p;
return code; return p.ID;
} }
[DllImport("libglib-2.0-0.dll")] [DllImport("libglib-2.0-0.dll")]

11
glib/Source.cs
View file

@ -33,17 +33,12 @@ namespace GLib {
internal class SourceProxy { internal class SourceProxy {
internal Delegate real_handler; internal Delegate real_handler;
internal Delegate proxy_handler; internal Delegate proxy_handler;
internal uint ID;
internal void Remove () internal void Remove ()
{ {
ArrayList keys = new ArrayList (); lock (Source.source_handlers)
lock (Source.source_handlers) { Source.source_handlers.Remove (ID);
foreach (uint code in Source.source_handlers.Keys)
if (Source.source_handlers [code] == this)
keys.Add (code);
foreach (object key in keys)
Source.source_handlers.Remove (key);
}
real_handler = null; real_handler = null;
proxy_handler = null; proxy_handler = null;
} }

6
glib/Timeout.cs
View file

@ -62,11 +62,11 @@ namespace GLib {
{ {
TimeoutProxy p = new TimeoutProxy (hndlr); TimeoutProxy p = new TimeoutProxy (hndlr);
uint code = g_timeout_add (interval, (TimeoutHandlerInternal) p.proxy_handler, IntPtr.Zero); p.ID = g_timeout_add (interval, (TimeoutHandlerInternal) p.proxy_handler, IntPtr.Zero);
lock (Source.source_handlers) lock (Source.source_handlers)
Source.source_handlers [code] = p; Source.source_handlers [p.ID] = p;
return code; return p.ID;
} }
} }
} }