Changeset 4788

Timestamp:

11/13/10 10:26:04 (14 years ago)

Author:

abeham

Message:

#1258

• Changed event handler cache to be static and keeping the DynamicMethod
• Added case when source property was null
• Added regions to clarify code a little

File:

• branches/ParameterBinding/HeuristicLab.Core/3.3/ItemBinding.cs (modified) (6 diffs)

branches/ParameterBinding/HeuristicLab.Core/3.3/ItemBinding.cs

@@ -23 +23 @@
     private bool bound;
 
-    private Dictionary<Type, Delegate> eventHandlerCache = new Dictionary<Type, Delegate>();
+    private static object evhCacheLock = new object();
+    private static Dictionary<Type, DynamicMethod> eventHandlerCache = new Dictionary<Type, DynamicMethod>();
 
     [StorableConstructor]
@@ -94 +95 @@
       string[] sourceProperties = sourcePath.Split('.');
       object cSource = source;
-      PropertyInfo bindingProperty = null;
+      #region Navigate to source property
       bool reregister = false;
       for (int i = 0; i < sourceProperties.Length; i++) {
@@ -101 +102 @@
         if (reregister) TryHookToChangedEvent(cSource, property + "Changed");
         if (cSource == sender) reregister = true;
-        bindingProperty = cSource.GetType().GetProperty(property, Flags);
-        object next = bindingProperty.GetGetMethod(true).Invoke(cSource, null);
+        object next = cSource.GetType().GetProperty(property, Flags).GetGetMethod(true).Invoke(cSource, null);
         cSource = next;
       }
+      #endregion
 
       string[] targetProperties = targetPath.Split('.');
       object cTarget = target;
+      MethodInfo targetSetter = null;
+      #region Navigate to target property
       for (int i = 0; i < targetProperties.Length - 1; i++) {
         cTarget = cTarget.GetType().GetProperty(targetProperties[i], Flags).GetGetMethod(true).Invoke(cTarget, null);
         if (cTarget == null) return;
       }
-      MethodInfo setter = cTarget.GetType().GetProperty(targetProperties.Last(), Flags).GetSetMethod(true);
-      if (cSource.GetType().IsValueType)
-        setter.Invoke(cTarget, new object[] { cSource });
+      targetSetter = cTarget.GetType().GetProperty(targetProperties.Last(), Flags).GetSetMethod(true);
+      if (targetSetter == null) return;
+      #endregion
+
+      if (cSource == null && !targetSetter.GetParameters().First().ParameterType.IsValueType
+        || cSource != null && cSource.GetType().IsValueType)
+        targetSetter.Invoke(cTarget, new object[] { cSource });
       else if (cSource is ICloneable)
-        setter.Invoke(cTarget, new object[] { ((ICloneable)cSource).Clone() });
+        targetSetter.Invoke(cTarget, new object[] { ((ICloneable)cSource).Clone() });
       else throw new InvalidOperationException("Can only bind to targets which are either a ValueType or an ICloneable.");
     }
@@ -126 +133 @@
         if (!eventHandlerCache.ContainsKey(methodParams[1]))
           CreateAndAddDynamicEventHandler(eInfo, methodParams);
-        eInfo.AddEventHandler(obj, eventHandlerCache[methodParams[1]]);
+        eInfo.AddEventHandler(obj, eventHandlerCache[methodParams[1]].CreateDelegate(eInfo.EventHandlerType, this));
       }
       return eInfo != null;
@@ -136 +143 @@
         Type[] methodParams = eInfo.EventHandlerType.GetMethod("Invoke").GetParameters().Select(x => x.ParameterType).ToArray();
         if (eventHandlerCache.ContainsKey(methodParams[1]))
-          eInfo.RemoveEventHandler(obj, eventHandlerCache[methodParams[1]]);
+          eInfo.RemoveEventHandler(obj, eventHandlerCache[methodParams[1]].CreateDelegate(eInfo.EventHandlerType, this));
       }
       return eInfo != null;
@@ -142 +149 @@
 
     private void CreateAndAddDynamicEventHandler(EventInfo eInfo, Type[] methodParams) {
-      Type[] instanceMethodParams = new Type[] { GetType() }.Concat(methodParams).ToArray();
-      DynamicMethod dynamicEventHandler = new DynamicMethod("sourceChanged", null, instanceMethodParams, GetType());
-      MethodInfo executeBindingMethodInfo = GetType().GetMethod("ExecuteBinding", Flags);
-      ILGenerator iLG = dynamicEventHandler.GetILGenerator();
-      iLG.Emit(OpCodes.Ldarg_0); // load 'this' pointer
-      iLG.Emit(OpCodes.Ldarg_1); // load sender parameter
-      iLG.Emit(OpCodes.Call, executeBindingMethodInfo); // call method to execute the binding
-      iLG.Emit(OpCodes.Ret);
-      eventHandlerCache.Add(methodParams[1], dynamicEventHandler.CreateDelegate(eInfo.EventHandlerType, this));
+      lock (evhCacheLock) {
+        if (!eventHandlerCache.ContainsKey(methodParams[1])) {
+          Type[] instanceMethodParams = new Type[] { GetType() }.Concat(methodParams).ToArray();
+          DynamicMethod dynamicEventHandler = new DynamicMethod("sourceChanged", null, instanceMethodParams, GetType());
+          MethodInfo executeBindingMethodInfo = GetType().GetMethod("ExecuteBinding", Flags);
+          ILGenerator iLG = dynamicEventHandler.GetILGenerator();
+          iLG.Emit(OpCodes.Ldarg_0); // load 'this' pointer
+          iLG.Emit(OpCodes.Ldarg_1); // load sender parameter
+          iLG.Emit(OpCodes.Call, executeBindingMethodInfo); // call method to execute the binding
+          iLG.Emit(OpCodes.Ret);
+          eventHandlerCache.Add(methodParams[1], dynamicEventHandler);
+        }
+      }
     }
   }