Replace UpdateFileFacade loop with Parallel.ForEach

wixtoolset · Aug 31, 2024 · 774a3b8 · 774a3b8
1 parent 1011c56
commit 774a3b8
Show file tree

Hide file tree

Showing 2 changed files with 331 additions and 219 deletions.
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -6,6 +6,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
+    using System.Threading;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
     using WixToolset.Data.WindowsInstaller;
@@ -50,6 +51,8 @@ public BindDatabaseCommand(IBindContext context, IEnumerable<IWindowsInstallerBa
             this.PatchSubStorages = patchSubStorages;
 
             this.BackendExtensions = backendExtension;
+
+            this.CancellationToken = context.CancellationToken;
         }
 
         private IServiceProvider ServiceProvider { get; }
@@ -100,6 +103,8 @@ public BindDatabaseCommand(IBindContext context, IEnumerable<IWindowsInstallerBa
 
         private string IntermediateFolder { get; }
 
+        private CancellationToken CancellationToken { get; }
+
         public IBindResult Execute()
         {
             if (!this.Intermediate.HasLevel(Data.IntermediateLevels.Linked) || !this.Intermediate.HasLevel(Data.IntermediateLevels.Resolved))
@@ -275,7 +280,7 @@ public IBindResult Execute()
 
             // Gather information about files that do not come from merge modules.
             {
-                var command = new UpdateFileFacadesCommand(this.Messaging, this.FileSystem, section, allFileFacades, fileFacadesFromIntermediate, variableCache, overwriteHash: true);
+                var command = new UpdateFileFacadesCommand(this.Messaging, this.FileSystem, section, allFileFacades, fileFacadesFromIntermediate, variableCache, overwriteHash: true, this.CancellationToken);
                 command.Execute();
             }
 
@@ -319,7 +324,7 @@ public IBindResult Execute()
                     {
                         var updatedFacades = reresolvedFiles.Select(f => allFileFacades.First(ff => ff.Id == f.Id?.Id));
 
-                        var command = new UpdateFileFacadesCommand(this.Messaging, this.FileSystem, section, allFileFacades, updatedFacades, variableCache, overwriteHash: false);
+                        var command = new UpdateFileFacadesCommand(this.Messaging, this.FileSystem, section, allFileFacades, updatedFacades, variableCache, overwriteHash: false, this.CancellationToken);
                         command.Execute();
                     }
                 }