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

Load debug symbols (.mdb on mono only; .pdb) for mods if they are present

Browse Source
This commit is contained in:
Jean-Rémy Buchs
2017-03-08 20:11:41 +01:00
parent f999001caf
commit 28cd480225
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Game/ObjectCreator.cs
View File

@@ -27,6 +27,7 @@ namespace OpenRA
readonly Cache<string, Type> typeCache; readonly Cache<string, Type> typeCache;
readonly Cache<Type, ConstructorInfo> ctorCache; readonly Cache<Type, ConstructorInfo> ctorCache;
readonly Pair<Assembly, string>[] assemblies; readonly Pair<Assembly, string>[] assemblies;
readonly bool isMonoRuntime = Type.GetType("Mono.Runtime") != null;
public ObjectCreator(Assembly a) public ObjectCreator(Assembly a)
{ {
@@ -55,13 +56,18 @@ namespace OpenRA
Assembly assembly; Assembly assembly;
if (!ResolvedAssemblies.TryGetValue(hash, out assembly)) if (!ResolvedAssemblies.TryGetValue(hash, out assembly))
{ {
Stream debugStream = null; Stream symbolStream = null;
if (Type.GetType("Mono.Runtime") != null && modFiles.TryOpen(path + ".mdb", out debugStream)) var hasSymbols = false;
assembly = Assembly.Load(data, debugStream.ReadAllBytes());
else if (modFiles.TryOpen(path.Substring(0, path.Length - 4) + ".pdb", out debugStream)) // Mono has its own symbol format.
assembly = Assembly.Load(data, debugStream.ReadAllBytes()); if (isMonoRuntime)
else hasSymbols = modFiles.TryOpen(path + ".mdb", out symbolStream);
assembly = Assembly.Load(data);
// .NET and newer mono versions can load portable .pdb files.
if (!hasSymbols)
hasSymbols = modFiles.TryOpen(path.Substring(0, path.Length - 4) + ".pdb", out symbolStream);
assembly = hasSymbols ? Assembly.Load(data, symbolStream.ReadAllBytes()) : Assembly.Load(data);
ResolvedAssemblies.Add(hash, assembly); ResolvedAssemblies.Add(hash, assembly);
} }