Sync inherited members.

This commit is contained in:
RoosterDragon
2015-07-30 01:29:53 +01:00
parent 33e779f4c0
commit cfd2f265d5

View File

@@ -20,18 +20,22 @@ namespace OpenRA
{
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
public sealed class SyncAttribute : Attribute { }
public interface ISync { } /* marker interface */
public interface ISync { } // marker interface
public static class Sync
{
static Cache<Type, Func<object, int>> hashFuncCache = new Cache<Type, Func<object, int>>(t => GenerateHashFunc(t));
static readonly ConcurrentCache<Type, DynamicMethod> HashMethods =
new ConcurrentCache<Type, DynamicMethod>(GenerateHashFunc);
static readonly ConcurrentCache<Type, Func<object, int>> HashFunctions =
new ConcurrentCache<Type, Func<object, int>>(
type => (Func<object, int>)HashMethods[type].CreateDelegate(typeof(Func<object, int>)));
public static int CalculateSyncHash(object obj)
{
return hashFuncCache[obj.GetType()](obj);
return HashFunctions[obj.GetType()](obj);
}
static Dictionary<Type, MethodInfo> hashFunctions = new Dictionary<Type, MethodInfo>()
static readonly Dictionary<Type, MethodInfo> SpecializedHashMethods = new Dictionary<Type, MethodInfo>
{
{ typeof(int2), ((Func<int2, int>)HashInt2).Method },
{ typeof(CPos), ((Func<CPos, int>)HashCPos).Method },
@@ -49,8 +53,8 @@ namespace OpenRA
static void EmitSyncOpcodes(Type type, ILGenerator il)
{
if (hashFunctions.ContainsKey(type))
il.EmitCall(OpCodes.Call, hashFunctions[type], null);
if (SpecializedHashMethods.ContainsKey(type))
il.EmitCall(OpCodes.Call, SpecializedHashMethods[type], null);
else if (type == typeof(bool))
{
var l = il.DefineLabel();
@@ -68,9 +72,9 @@ namespace OpenRA
il.Emit(OpCodes.Xor);
}
public static Func<object, int> GenerateHashFunc(Type t)
static DynamicMethod GenerateHashFunc(Type t)
{
var d = new DynamicMethod("hash_{0}".F(t.Name), typeof(int), new Type[] { typeof(object) }, t);
var d = new DynamicMethod("Hash_{0}".F(t.Name), typeof(int), new Type[] { typeof(object) }, t);
var il = d.GetILGenerator();
var this_ = il.DeclareLocal(t).LocalIndex;
il.Emit(OpCodes.Ldarg_0);
@@ -78,13 +82,17 @@ namespace OpenRA
il.Emit(OpCodes.Stloc, this_);
il.Emit(OpCodes.Ldc_I4_0);
const BindingFlags Binding = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
var neededSync = false;
const BindingFlags Binding = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly;
foreach (var field in t.GetFields(Binding).Where(x => x.HasAttribute<SyncAttribute>()))
{
il.Emit(OpCodes.Ldloc, this_);
il.Emit(OpCodes.Ldfld, field);
EmitSyncOpcodes(field.FieldType, il);
neededSync = true;
}
foreach (var prop in t.GetProperties(Binding).Where(x => x.HasAttribute<SyncAttribute>()))
@@ -93,10 +101,23 @@ namespace OpenRA
il.EmitCall(OpCodes.Call, prop.GetGetMethod(), null);
EmitSyncOpcodes(prop.PropertyType, il);
neededSync = true;
}
if (t.BaseType != null)
{
var baseHashFunc = HashMethods[t.BaseType];
if (baseHashFunc != null)
{
il.Emit(OpCodes.Ldloc, this_);
il.EmitCall(OpCodes.Call, baseHashFunc, null);
il.Emit(OpCodes.Xor);
neededSync = true;
}
}
il.Emit(OpCodes.Ret);
return (Func<object, int>)d.CreateDelegate(typeof(Func<object, int>));
return neededSync ? d : null;
}
public static int HashInt2(int2 i2)