simplify parallel rewriting logic
This commit is contained in:
parent
74a8399b9c
commit
92aaf3fb8a
|
@ -1,6 +1,6 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading.Tasks;
|
||||||
using Mono.Cecil;
|
using Mono.Cecil;
|
||||||
using Mono.Cecil.Cil;
|
using Mono.Cecil.Cil;
|
||||||
using Mono.Collections.Generic;
|
using Mono.Collections.Generic;
|
||||||
|
@ -58,20 +58,15 @@ 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()
|
||||||
{
|
{
|
||||||
// rewrite each type in the assembly, tracking whether any type was rewritten (Item1)
|
|
||||||
// and any exception that occurred during rewriting (Item2).
|
|
||||||
var cancellationToken = new CancellationTokenSource();
|
|
||||||
Tuple<bool, Exception> result = this.Module
|
|
||||||
.GetTypes()
|
|
||||||
.Where(type => type.BaseType != null) // skip special types like <Module>
|
|
||||||
.AsParallel()
|
|
||||||
.WithExecutionMode(ParallelExecutionMode.ForceParallelism)
|
|
||||||
.Select(type =>
|
|
||||||
{
|
|
||||||
if (cancellationToken.IsCancellationRequested)
|
|
||||||
return Tuple.Create(false, null as Exception);
|
|
||||||
|
|
||||||
bool anyRewritten = false;
|
bool anyRewritten = false;
|
||||||
|
Exception exception = null;
|
||||||
|
Parallel.ForEach(
|
||||||
|
source: this.Module.GetTypes().Where(type => type.BaseType != null), // skip special types like <Module>
|
||||||
|
body: type =>
|
||||||
|
{
|
||||||
|
if (exception != null)
|
||||||
|
return;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
anyRewritten |= this.RewriteCustomAttributes(type.CustomAttributes);
|
anyRewritten |= this.RewriteCustomAttributes(type.CustomAttributes);
|
||||||
|
@ -118,22 +113,17 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return Tuple.Create(anyRewritten, null as Exception);
|
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
cancellationToken.Cancel();
|
exception ??= ex;
|
||||||
return Tuple.Create(anyRewritten, e);
|
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
.Aggregate(Tuple.Create(false, null as Exception), (a, b) => Tuple.Create(a.Item1 || b.Item1, a.Item2 ?? b.Item2));
|
);
|
||||||
|
|
||||||
bool rewritten = result.Item1;
|
|
||||||
Exception exception = result.Item2;
|
|
||||||
return exception == null
|
return exception == null
|
||||||
? rewritten
|
? anyRewritten
|
||||||
: throw exception;
|
: throw new Exception($"Rewriting {this.Module.Name} failed.", exception);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue