epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made FieldLoader thread-safe, and cache some expensive reflection calls.

Browse Source
This commit is contained in:
RoosterDragon
2015-04-09 22:26:33 +01:00
parent 109ccbb0b0
commit d2d2f4a838
2 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
OpenRA.Game/FieldLoader.cs
View File

@@ -33,9 +33,17 @@ namespace OpenRA
throw new NotImplementedException("FieldLoader: Missing field `{0}` on `{1}`".F(s, f.Name));
};
static readonly ConcurrentCache<Type, FieldLoadInfo[]> TypeLoadInfo =
new ConcurrentCache<Type, FieldLoadInfo[]>(BuildTypeLoadInfo);
static readonly ConcurrentCache<MemberInfo, bool> MemberHasTranslateAttribute =
new ConcurrentCache<MemberInfo, bool>(member => member.HasAttribute<TranslateAttribute>());
static readonly object TranslationsLock = new object();
static Dictionary<string, string> translations;
public static void Load(object self, MiniYaml my)
{
var loadInfo = typeLoadInfo[self.GetType()];
var loadInfo = TypeLoadInfo[self.GetType()];
Dictionary<string, MiniYaml> md = null;
@@ -82,7 +90,6 @@ namespace OpenRA
return t;
}
static readonly object[] NoIndexes = { };
public static void LoadField(object target, string key, string value)
{
const BindingFlags Flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
@@ -103,7 +110,7 @@ namespace OpenRA
{
var sa = prop.GetCustomAttributes<SerializeAttribute>(false).DefaultIfEmpty(SerializeAttribute.Default).First();
if (!sa.FromYamlKey)
prop.SetValue(target, GetValue(prop.Name, prop.PropertyType, value, prop), NoIndexes);
prop.SetValue(target, GetValue(prop.Name, prop.PropertyType, value, prop), null);
return;
}
@@ -162,7 +169,7 @@ namespace OpenRA
}
else if (fieldType == typeof(string))
{
if (field != null && field.HasAttribute<TranslateAttribute>())
if (field != null && MemberHasTranslateAttribute[field])
return Regex.Replace(value, "@[^@]+@", m => Translate(m.Value.Substring(1, m.Value.Length - 2)), RegexOptions.Compiled);
return value;
}
@@ -438,12 +445,10 @@ namespace OpenRA
public static IEnumerable<FieldLoadInfo> GetTypeLoadInfo(Type type, bool includePrivateByDefault = false)
{
return typeLoadInfo[type].Where(fli => includePrivateByDefault || fli.Field.IsPublic || (fli.Attribute.Serialize && !fli.Attribute.IsDefault));
return TypeLoadInfo[type].Where(fli => includePrivateByDefault || fli.Field.IsPublic || (fli.Attribute.Serialize && !fli.Attribute.IsDefault));
}
static Cache<Type, List<FieldLoadInfo>> typeLoadInfo = new Cache<Type, List<FieldLoadInfo>>(BuildTypeLoadInfo);
static List<FieldLoadInfo> BuildTypeLoadInfo(Type type)
static FieldLoadInfo[] BuildTypeLoadInfo(Type type)
{
var ret = new List<FieldLoadInfo>();
@@ -465,7 +470,7 @@ namespace OpenRA
ret.Add(fli);
}
return ret;
return ret.ToArray();
}
[AttributeUsage(AttributeTargets.Field)]
@@ -520,17 +525,27 @@ namespace OpenRA
public static string Translate(string key)
{
if (Translations == null || string.IsNullOrEmpty(key))
if (string.IsNullOrEmpty(key))
return key;
string value;
if (!Translations.TryGetValue(key, out value))
return key;
lock (TranslationsLock)
{
if (translations == null)
return key;
return value;
string value;
if (!translations.TryGetValue(key, out value))
return key;
return value;
}
}
public static Dictionary<string, string> Translations = new Dictionary<string, string>();
public static void SetTranslations(IDictionary<string, string> translations)
{
lock (TranslationsLock)
FieldLoader.translations = new Dictionary<string, string>(translations);
}
}
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
@@ -546,6 +561,7 @@ namespace OpenRA
}
// mirrors DescriptionAttribute from System.ComponentModel but we dont want to have to use that everywhere.
[AttributeUsage(AttributeTargets.All)]
public sealed class DescAttribute : Attribute
{
public readonly string[] Lines;