Merge pull request #150 from DavidKarlas/avoidJITing

Convert Timeout/Idle.Handler method from instance to static, so it's …

Author: DavidKarlas

glib/Idle.cs

@@ -32,7 +32,7 @@ namespace GLib {
 	public class Idle {
 
 		[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
-		delegate bool IdleHandlerInternal ();
+		delegate bool IdleHandlerInternal (IntPtr ptr);
 
 
 		internal class IdleProxy : SourceProxy {
@@ -65,14 +65,17 @@ protected virtual void Dispose (bool disposing)
 					Source.Remove (ID);
 			}
 
-			public bool Handler ()
+			static bool Handler (IntPtr data)
 			{
 				try {
-					IdleHandler idle_handler = (IdleHandler) real_handler;
+					SourceProxy obj;
+					lock(proxies)
+						obj = proxies [(int)data];
+					IdleHandler idle_handler = (IdleHandler)obj.real_handler;
 
 					bool cont = idle_handler ();
 					if (!cont)
-						Remove ();
+						obj.Remove ();
 					return cont;
 				} catch (Exception e) {
 					ExceptionManager.RaiseUnhandledException (e, false);
@@ -91,7 +94,7 @@ private Idle ()
 		public static uint Add (IdleHandler hndlr)
 		{
 			IdleProxy p = new IdleProxy (hndlr);
-			p.ID = g_idle_add ((IdleHandlerInternal) p.proxy_handler, IntPtr.Zero);
+			p.ID = g_idle_add ((IdleHandlerInternal)p.proxy_handler, (IntPtr)p.proxyId);
 			lock (Source.source_handlers)
 				Source.source_handlers [p.ID] = p;
 
@@ -113,6 +116,10 @@ public static bool Remove (IdleHandler hndlr)
 					if (p != null && p.real_handler == (System.Delegate) hndlr) {
 						keys.Add (code);
 						result = g_source_remove (code);
+						p.proxy_handler = null;
+						p.real_handler = null;
+						lock(SourceProxy.proxies)
+							SourceProxy.proxies.Remove (p.proxyId);
 					}
 				}
 

glib/Source.cs

@@ -23,7 +23,9 @@ namespace GLib {
 
 	using System;
 	using System.Collections;
+	using System.Collections.Generic;
 	using System.Runtime.InteropServices;
+	using System.Threading;
 
 	public delegate bool GSourceFunc ();
 
@@ -35,12 +37,28 @@ internal class SourceProxy {
 		internal Delegate proxy_handler;
 		internal uint ID;
 
+		internal int proxyId;
+		static int idCounter;
+		internal static Dictionary<int, SourceProxy> proxies = new Dictionary<int, SourceProxy> ();
+
+		protected SourceProxy ()
+		{
+			lock(proxies) {
+				do {
+					proxyId = idCounter++;
+				} while (proxies.ContainsKey (proxyId));
+				proxies [proxyId] = this;
+			}
+		}
+
 		internal void Remove ()
 		{
 			lock (Source.source_handlers)
 				Source.source_handlers.Remove (ID);
 			real_handler = null;
 			proxy_handler = null;
+			lock(proxies)
+				proxies.Remove (proxyId);
 		}
 	}
 

glib/Timeout.cs

@@ -29,7 +29,7 @@ namespace GLib {
 	public class Timeout {
 
 		[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
-		delegate bool TimeoutHandlerInternal ();
+		delegate bool TimeoutHandlerInternal (IntPtr ptr);
 
 		internal class TimeoutProxy : SourceProxy {
 			public TimeoutProxy (TimeoutHandler real)
@@ -62,14 +62,17 @@ protected virtual void Dispose (bool disposing)
 					Source.Remove (ID);
 			}
 
-			public bool Handler ()
+			static bool Handler (IntPtr data)
 			{
 				try {
-					TimeoutHandler timeout_handler = (TimeoutHandler) real_handler;
+					SourceProxy obj;
+					lock (proxies)
+						obj = proxies [(int)data];
+					TimeoutHandler timeout_handler = (TimeoutHandler)obj.real_handler;
 
 					bool cont = timeout_handler ();
 					if (!cont)
-						Remove ();
+						obj.Remove ();
 					return cont;
 				} catch (Exception e) {
 					ExceptionManager.RaiseUnhandledException (e, false);
@@ -87,7 +90,7 @@ public static uint Add (uint interval, TimeoutHandler hndlr)
 		{
 			TimeoutProxy p = new TimeoutProxy (hndlr);
 
-			p.ID = g_timeout_add (interval, (TimeoutHandlerInternal) p.proxy_handler, IntPtr.Zero);
+			p.ID = g_timeout_add (interval, (TimeoutHandlerInternal) p.proxy_handler, (IntPtr)p.proxyId);
 			lock (Source.source_handlers)
 				Source.source_handlers [p.ID] = p;