From 544919ad1328c0f8b283941b1c2c5c8864a3a84d Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Thu, 13 Aug 2020 20:01:22 -0400
Subject: remove experimental RewriteInParallel option

---
 src/SMAPI/Framework/ModLoading/AssemblyLoader.cs   | 10 ++--
 .../ModLoading/Framework/RecursiveRewriter.cs      | 57 ++++------------------
 2 files changed, 14 insertions(+), 53 deletions(-)

(limited to 'src/SMAPI/Framework/ModLoading')

diff --git a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
index f8c901e0..dbb5f696 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
@@ -76,10 +76,9 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <param name="mod">The mod for which the assembly is being loaded.</param>
         /// <param name="assemblyPath">The assembly file path.</param>
         /// <param name="assumeCompatible">Assume the mod is compatible, even if incompatible code is detected.</param>
-        /// <param name="rewriteInParallel">Whether to enable experimental parallel rewriting.</param>
         /// <returns>Returns the rewrite metadata for the preprocessed assembly.</returns>
         /// <exception cref="IncompatibleInstructionException">An incompatible CIL instruction was found while rewriting the assembly.</exception>
-        public Assembly Load(IModMetadata mod, string assemblyPath, bool assumeCompatible, bool rewriteInParallel)
+        public Assembly Load(IModMetadata mod, string assemblyPath, bool assumeCompatible)
         {
             // get referenced local assemblies
             AssemblyParseResult[] assemblies;
@@ -109,7 +108,7 @@ namespace StardewModdingAPI.Framework.ModLoading
                     continue;
 
                 // rewrite assembly
-                bool changed = this.RewriteAssembly(mod, assembly.Definition, loggedMessages, logPrefix: "      ", rewriteInParallel);
+                bool changed = this.RewriteAssembly(mod, assembly.Definition, loggedMessages, logPrefix: "      ");
 
                 // detect broken assembly reference
                 foreach (AssemblyNameReference reference in assembly.Definition.MainModule.AssemblyReferences)
@@ -263,10 +262,9 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <param name="assembly">The assembly to rewrite.</param>
         /// <param name="loggedMessages">The messages that have already been logged for this mod.</param>
         /// <param name="logPrefix">A string to prefix to log messages.</param>
-        /// <param name="rewriteInParallel">Whether to enable experimental parallel rewriting.</param>
         /// <returns>Returns whether the assembly was modified.</returns>
         /// <exception cref="IncompatibleInstructionException">An incompatible CIL instruction was found while rewriting the assembly.</exception>
-        private bool RewriteAssembly(IModMetadata mod, AssemblyDefinition assembly, HashSet<string> loggedMessages, string logPrefix, bool rewriteInParallel)
+        private bool RewriteAssembly(IModMetadata mod, AssemblyDefinition assembly, HashSet<string> loggedMessages, string logPrefix)
         {
             ModuleDefinition module = assembly.MainModule;
             string filename = $"{assembly.Name.Name}.dll";
@@ -315,7 +313,7 @@ namespace StardewModdingAPI.Framework.ModLoading
                     return rewritten;
                 }
             );
-            bool anyRewritten = rewriter.RewriteModule(rewriteInParallel);
+            bool anyRewritten = rewriter.RewriteModule();
 
             // handle rewrite flags
             foreach (IInstructionHandler handler in handlers)
diff --git a/src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs b/src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs
index 34c78c7d..fb651465 100644
--- a/src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using Mono.Collections.Generic;
@@ -57,59 +55,24 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
         }
 
         /// <summary>Rewrite the loaded module code.</summary>
-        /// <param name="rewriteInParallel">Whether to enable experimental parallel rewriting.</param>
         /// <returns>Returns whether the module was modified.</returns>
-        public bool RewriteModule(bool rewriteInParallel)
+        public bool RewriteModule()
         {
             IEnumerable<TypeDefinition> types = this.Module.GetTypes().Where(type => type.BaseType != null); // skip special types like <Module>
 
-            // experimental parallel rewriting
-            // This may cause intermittent startup errors and is disabled by default: https://github.com/Pathoschild/SMAPI/issues/721
-            if (rewriteInParallel)
-            {
-                int typesChanged = 0;
-                Exception exception = null;
-
-                Parallel.ForEach(types, type =>
-                {
-                    if (exception != null)
-                        return;
-
-                    bool changed = false;
-                    try
-                    {
-                        changed = this.RewriteTypeDefinition(type);
-                    }
-                    catch (Exception ex)
-                    {
-                        exception ??= ex;
-                    }
-
-                    if (changed)
-                        Interlocked.Increment(ref typesChanged);
-                });
+            bool changed = false;
 
-                return exception == null
-                    ? typesChanged > 0
-                    : throw new Exception($"Rewriting {this.Module.Name} failed.", exception);
+            try
+            {
+                foreach (var type in types)
+                    changed |= this.RewriteTypeDefinition(type);
             }
-
-            // non-parallel rewriting
+            catch (Exception ex)
             {
-                bool changed = false;
-
-                try
-                {
-                    foreach (var type in types)
-                        changed |= this.RewriteTypeDefinition(type);
-                }
-                catch (Exception ex)
-                {
-                    throw new Exception($"Rewriting {this.Module.Name} failed.", ex);
-                }
-
-                return changed;
+                throw new Exception($"Rewriting {this.Module.Name} failed.", ex);
             }
+
+            return changed;
         }
 
 
-- 
cgit