StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #718 from ZaneYork/develop 

Parallel exception aggregate fix
This commit is contained in:
Jesse Plamondon-Willard 2020-06-03 18:48:32 -04:00 committed by GitHub
parent 73e3735dcd 9b41397a01
commit cfc7233a06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 61 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs
View File

@ -57,60 +57,74 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
/// <returns>Returns whether the module was modified.</returns> /// <returns>Returns whether the module was modified.</returns>
public bool RewriteModule() public bool RewriteModule()
{ {
bool anyRewritten = false; Tuple<bool,Exception> aggregateResult = this.Module.GetTypes()
.AsParallel().WithExecutionMode(ParallelExecutionMode.ForceParallelism)
foreach (TypeDefinition type in this.Module.GetTypes()) .Select(type =>
{
if (type.BaseType == null)
continue; // special type like <Module>
anyRewritten |= this.RewriteCustomAttributes(type.CustomAttributes);
anyRewritten |= this.RewriteGenericParameters(type.GenericParameters);
foreach (InterfaceImplementation @interface in type.Interfaces)
anyRewritten |= this.RewriteTypeReference(@interface.InterfaceType, newType => @interface.InterfaceType = newType);
if (type.BaseType.FullName != "System.Object")
anyRewritten |= this.RewriteTypeReference(type.BaseType, newType => type.BaseType = newType);
foreach (MethodDefinition method in type.Methods)
{ {
anyRewritten |= this.RewriteTypeReference(method.ReturnType, newType => method.ReturnType = newType); try
anyRewritten |= this.RewriteGenericParameters(method.GenericParameters);
anyRewritten |= this.RewriteCustomAttributes(method.CustomAttributes);
foreach (ParameterDefinition parameter in method.Parameters)
anyRewritten |= this.RewriteTypeReference(parameter.ParameterType, newType => parameter.ParameterType = newType);
foreach (var methodOverride in method.Overrides)
anyRewritten |= this.RewriteMethodReference(methodOverride);
if (method.HasBody)
{ {
foreach (VariableDefinition variable in method.Body.Variables) bool anyRewritten = false;
anyRewritten |= this.RewriteTypeReference(variable.VariableType, newType => variable.VariableType = newType); if (type.BaseType == null)
return new Tuple<bool, Exception>(anyRewritten, null); // special type like <Module>
// check CIL instructions anyRewritten |= this.RewriteCustomAttributes(type.CustomAttributes);
ILProcessor cil = method.Body.GetILProcessor(); anyRewritten |= this.RewriteGenericParameters(type.GenericParameters);
Collection<Instruction> instructions = cil.Body.Instructions;
for (int i = 0; i < instructions.Count; i++) foreach (InterfaceImplementation @interface in type.Interfaces)
anyRewritten |= this.RewriteTypeReference(@interface.InterfaceType, newType => @interface.InterfaceType = newType);
if (type.BaseType.FullName != "System.Object")
anyRewritten |= this.RewriteTypeReference(type.BaseType, newType => type.BaseType = newType);
foreach (MethodDefinition method in type.Methods)
{ {
var instruction = instructions[i]; anyRewritten |= this.RewriteTypeReference(method.ReturnType, newType => method.ReturnType = newType);
if (instruction.OpCode.Code == Code.Nop) anyRewritten |= this.RewriteGenericParameters(method.GenericParameters);
continue; anyRewritten |= this.RewriteCustomAttributes(method.CustomAttributes);
anyRewritten |= this.RewriteInstruction(instruction, cil, newInstruction => foreach (ParameterDefinition parameter in method.Parameters)
anyRewritten |= this.RewriteTypeReference(parameter.ParameterType, newType => parameter.ParameterType = newType);
foreach (var methodOverride in method.Overrides)
anyRewritten |= this.RewriteMethodReference(methodOverride);
if (method.HasBody)
{ {
anyRewritten = true; foreach (VariableDefinition variable in method.Body.Variables)
cil.Replace(instruction, newInstruction); anyRewritten |= this.RewriteTypeReference(variable.VariableType, newType => variable.VariableType = newType);
instruction = newInstruction;
});
}
}
}
}
return anyRewritten; // check CIL instructions
ILProcessor cil = method.Body.GetILProcessor();
Collection<Instruction> instructions = cil.Body.Instructions;
for (int i = 0; i < instructions.Count; i++)
{
var instruction = instructions[i];
if (instruction.OpCode.Code == Code.Nop)
continue;
anyRewritten |= this.RewriteInstruction(instruction, cil, newInstruction =>
{
anyRewritten = true;
cil.Replace(instruction, newInstruction);
instruction = newInstruction;
});
}
}
}
return new Tuple<bool, Exception>(anyRewritten, null);
}
catch (Exception e)
{
return new Tuple<bool, Exception>(false, e.InnerException ?? e);
}
})
.Aggregate((tupleA, tupleB) => new Tuple<bool, Exception>(tupleA.Item1 | tupleB.Item1, tupleA.Item2 ?? tupleB.Item2)); // Aggregate result and exception
if (aggregateResult.Item2 != null)
{
throw aggregateResult.Item2; // rethrow inner Exception
}
return aggregateResult.Item1;
} }