fix: FileDiffResultListsの静的状態をスレッドセーフ化し、ResetAll追加

Author: Widthdom

FolderDiffIL4DotNet.Tests/Models/FileDiffResultListsTests.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Linq;
+using System.Threading.Tasks;
 using FolderDiffIL4DotNet.Models;
 using Xunit;
 
@@ -19,17 +21,7 @@ public void Dispose()
 
         private static void ClearAll()
         {
-            FileDiffResultLists.OldFilesAbsolutePath = new System.Collections.Generic.List<string>();
-            FileDiffResultLists.NewFilesAbsolutePath = new System.Collections.Generic.List<string>();
-            FileDiffResultLists.UnchangedFilesRelativePath = new System.Collections.Generic.List<string>();
-            FileDiffResultLists.AddedFilesAbsolutePath = new System.Collections.Generic.List<string>();
-            FileDiffResultLists.RemovedFilesAbsolutePath = new System.Collections.Generic.List<string>();
-            FileDiffResultLists.ModifiedFilesRelativePath = new System.Collections.Generic.List<string>();
-            FileDiffResultLists.FileRelativePathToDiffDetailDictionary.Clear();
-            FileDiffResultLists.FileRelativePathToIlDisassemblerLabelDictionary.Clear();
-            FileDiffResultLists.IgnoredFilesRelativePathToLocation.Clear();
-            FileDiffResultLists.DisassemblerToolVersions.Clear();
-            FileDiffResultLists.DisassemblerToolVersionsFromCache.Clear();
+            FileDiffResultLists.ResetAll();
         }
 
         #region RecordDiffDetail
@@ -192,5 +184,71 @@ public void RecordDisassemblerToolVersion_NoVersion_UsesToolNameOnly()
         }
 
         #endregion
+
+        #region CollectionState
+
+        [Fact]
+        public void SetOldFilesAbsolutePath_ReplacesExistingEntries()
+        {
+            FileDiffResultLists.SetOldFilesAbsolutePath(new[] { "old-a.dll", "old-b.dll" });
+            FileDiffResultLists.SetOldFilesAbsolutePath(new[] { "old-c.dll" });
+
+            Assert.Single(FileDiffResultLists.OldFilesAbsolutePath);
+            Assert.Equal("old-c.dll", FileDiffResultLists.OldFilesAbsolutePath.Single());
+        }
+
+        [Fact]
+        public void AddUnchangedFileRelativePath_Parallel_AllEntriesRecorded()
+        {
+            const int total = 1000;
+            Parallel.For(0, total, i =>
+            {
+                FileDiffResultLists.AddUnchangedFileRelativePath($"unchanged-{i}.dll");
+            });
+
+            Assert.Equal(total, FileDiffResultLists.UnchangedFilesRelativePath.Count);
+        }
+
+        [Fact]
+        public void ResetAll_ClearsAllState()
+        {
+            FileDiffResultLists.SetOldFilesAbsolutePath(new[] { "old-a.dll" });
+            FileDiffResultLists.SetNewFilesAbsolutePath(new[] { "new-a.dll" });
+            FileDiffResultLists.AddUnchangedFileRelativePath("same.dll");
+            FileDiffResultLists.AddAddedFileAbsolutePath("added.dll");
+            FileDiffResultLists.AddRemovedFileAbsolutePath("removed.dll");
+            FileDiffResultLists.AddModifiedFileRelativePath("modified.dll");
+            FileDiffResultLists.RecordDiffDetail("same.dll", FileDiffResultLists.DiffDetailResult.MD5Match);
+            FileDiffResultLists.RecordIgnoredFile("ignored.pdb", FileDiffResultLists.IgnoredFileLocation.Old);
+            FileDiffResultLists.RecordDisassemblerToolVersion("dotnet-ildasm", "1.0.0");
+            FileDiffResultLists.RecordDisassemblerToolVersion("dotnet-ildasm", "1.0.0", fromCache: true);
+
+            FileDiffResultLists.ResetAll();
+
+            Assert.Empty(FileDiffResultLists.OldFilesAbsolutePath);
+            Assert.Empty(FileDiffResultLists.NewFilesAbsolutePath);
+            Assert.Empty(FileDiffResultLists.UnchangedFilesRelativePath);
+            Assert.Empty(FileDiffResultLists.AddedFilesAbsolutePath);
+            Assert.Empty(FileDiffResultLists.RemovedFilesAbsolutePath);
+            Assert.Empty(FileDiffResultLists.ModifiedFilesRelativePath);
+            Assert.Empty(FileDiffResultLists.FileRelativePathToDiffDetailDictionary);
+            Assert.Empty(FileDiffResultLists.FileRelativePathToIlDisassemblerLabelDictionary);
+            Assert.Empty(FileDiffResultLists.IgnoredFilesRelativePathToLocation);
+            Assert.Empty(FileDiffResultLists.DisassemblerToolVersions);
+            Assert.Empty(FileDiffResultLists.DisassemblerToolVersionsFromCache);
+        }
+
+        [Fact]
+        public void ResultQueueProperties_AreReadOnly()
+        {
+            Assert.False(typeof(FileDiffResultLists).GetProperty(nameof(FileDiffResultLists.OldFilesAbsolutePath))?.CanWrite);
+            Assert.False(typeof(FileDiffResultLists).GetProperty(nameof(FileDiffResultLists.NewFilesAbsolutePath))?.CanWrite);
+            Assert.False(typeof(FileDiffResultLists).GetProperty(nameof(FileDiffResultLists.UnchangedFilesRelativePath))?.CanWrite);
+            Assert.False(typeof(FileDiffResultLists).GetProperty(nameof(FileDiffResultLists.AddedFilesAbsolutePath))?.CanWrite);
+            Assert.False(typeof(FileDiffResultLists).GetProperty(nameof(FileDiffResultLists.RemovedFilesAbsolutePath))?.CanWrite);
+            Assert.False(typeof(FileDiffResultLists).GetProperty(nameof(FileDiffResultLists.ModifiedFilesRelativePath))?.CanWrite);
+        }
+
+        #endregion
     }
 }

FolderDiffIL4DotNet.Tests/Services/ReportGenerateServiceTests.cs

@@ -97,10 +97,10 @@ public void GenerateDiffReport_IlDiffDetailsIncludeDisassemblerLabel()
             Directory.CreateDirectory(newDir);
             Directory.CreateDirectory(reportDir);
 
-            FileDiffResultLists.OldFilesAbsolutePath = new List<string> { Path.Combine(oldDir, "a.dll"), Path.Combine(oldDir, "b.dll") };
-            FileDiffResultLists.NewFilesAbsolutePath = new List<string> { Path.Combine(newDir, "a.dll"), Path.Combine(newDir, "b.dll") };
-            FileDiffResultLists.UnchangedFilesRelativePath = new List<string> { "a.dll" };
-            FileDiffResultLists.ModifiedFilesRelativePath = new List<string> { "b.dll" };
+            FileDiffResultLists.SetOldFilesAbsolutePath(new List<string> { Path.Combine(oldDir, "a.dll"), Path.Combine(oldDir, "b.dll") });
+            FileDiffResultLists.SetNewFilesAbsolutePath(new List<string> { Path.Combine(newDir, "a.dll"), Path.Combine(newDir, "b.dll") });
+            FileDiffResultLists.AddUnchangedFileRelativePath("a.dll");
+            FileDiffResultLists.AddModifiedFileRelativePath("b.dll");
 
             FileDiffResultLists.RecordDiffDetail("a.dll", FileDiffResultLists.DiffDetailResult.ILMatch, "dotnet-ildasm (version: dotnet ildasm 0.12.0)");
             FileDiffResultLists.RecordDiffDetail("b.dll", FileDiffResultLists.DiffDetailResult.ILMismatch, "dotnet-ildasm (version: dotnet ildasm 0.12.0)");
@@ -191,17 +191,7 @@ public void GenerateDiffReport_HeaderOmitsIlContainsIgnoreNote_WhenDisabled()
 
         private static void ClearResultLists()
         {
-            FileDiffResultLists.OldFilesAbsolutePath = new List<string>();
-            FileDiffResultLists.NewFilesAbsolutePath = new List<string>();
-            FileDiffResultLists.UnchangedFilesRelativePath = new List<string>();
-            FileDiffResultLists.AddedFilesAbsolutePath = new List<string>();
-            FileDiffResultLists.RemovedFilesAbsolutePath = new List<string>();
-            FileDiffResultLists.ModifiedFilesRelativePath = new List<string>();
-            FileDiffResultLists.FileRelativePathToDiffDetailDictionary.Clear();
-            FileDiffResultLists.FileRelativePathToIlDisassemblerLabelDictionary.Clear();
-            FileDiffResultLists.IgnoredFilesRelativePathToLocation.Clear();
-            FileDiffResultLists.DisassemblerToolVersions.Clear();
-            FileDiffResultLists.DisassemblerToolVersionsFromCache.Clear();
+            FileDiffResultLists.ResetAll();
         }
     }
 }

Models/FileDiffResultLists.cs

@@ -45,32 +45,32 @@ public enum IgnoredFileLocation
         /// <summary>
         /// 旧バージョン側（比較元）ファイルの絶対パスのリスト
         /// </summary>
-        public static List<string> OldFilesAbsolutePath { get; set; } = [];
+        public static ConcurrentQueue<string> OldFilesAbsolutePath { get; } = new ConcurrentQueue<string>();
 
         /// <summary>
         /// 新バージョン側（比較先）ファイルの絶対パスのリスト
         /// </summary>
-        public static List<string> NewFilesAbsolutePath { get; set; } = [];
+        public static ConcurrentQueue<string> NewFilesAbsolutePath { get; } = new ConcurrentQueue<string>();
 
         /// <summary>
         /// 差異のないファイルの相対パスのリスト
         /// </summary>
-        public static List<string> UnchangedFilesRelativePath { get; set; } = [];
+        public static ConcurrentQueue<string> UnchangedFilesRelativePath { get; } = new ConcurrentQueue<string>();
 
         /// <summary>
         /// 追加されたファイルの絶対パスのリスト
         /// </summary>
-        public static List<string> AddedFilesAbsolutePath { get; set; } = [];
+        public static ConcurrentQueue<string> AddedFilesAbsolutePath { get; } = new ConcurrentQueue<string>();
 
         /// <summary>
         /// 削除されたファイルの絶対パスのリスト
         /// </summary>
-        public static List<string> RemovedFilesAbsolutePath { get; set; } = [];
+        public static ConcurrentQueue<string> RemovedFilesAbsolutePath { get; } = new ConcurrentQueue<string>();
 
         /// <summary>
         /// 変更されたファイルの相対パスのリスト
         /// </summary>
-        public static List<string> ModifiedFilesRelativePath { get; set; } = [];
+        public static ConcurrentQueue<string> ModifiedFilesRelativePath { get; } = new ConcurrentQueue<string>();
 
         /// <summary>
         /// ファイル間の比較結果を保持する辞書 (並列比較で安全に書き込みできるよう ConcurrentDictionary)。
@@ -103,6 +103,78 @@ public enum IgnoredFileLocation
         public static ConcurrentDictionary<string, byte> DisassemblerToolVersionsFromCache { get; } = new ConcurrentDictionary<string, byte>(StringComparer.OrdinalIgnoreCase);
         #endregion
 
+        /// <summary>
+        /// 旧バージョン側（比較元）ファイルの絶対パス一覧を置き換えます。
+        /// </summary>
+        /// <param name="oldFilesAbsolutePath">旧バージョン側（比較元）ファイルの絶対パス一覧。</param>
+        public static void SetOldFilesAbsolutePath(IEnumerable<string> oldFilesAbsolutePath)
+        {
+            ReplaceQueueItems(OldFilesAbsolutePath, oldFilesAbsolutePath, nameof(oldFilesAbsolutePath));
+        }
+
+        /// <summary>
+        /// 新バージョン側（比較先）ファイルの絶対パス一覧を置き換えます。
+        /// </summary>
+        /// <param name="newFilesAbsolutePath">新バージョン側（比較先）ファイルの絶対パス一覧。</param>
+        public static void SetNewFilesAbsolutePath(IEnumerable<string> newFilesAbsolutePath)
+        {
+            ReplaceQueueItems(NewFilesAbsolutePath, newFilesAbsolutePath, nameof(newFilesAbsolutePath));
+        }
+
+        /// <summary>
+        /// 差異のないファイルの相対パスを記録します。
+        /// </summary>
+        /// <param name="fileRelativePath">ファイルの相対パス。</param>
+        public static void AddUnchangedFileRelativePath(string fileRelativePath)
+        {
+            EnqueuePath(UnchangedFilesRelativePath, fileRelativePath, nameof(fileRelativePath));
+        }
+
+        /// <summary>
+        /// 追加されたファイルの絶対パスを記録します。
+        /// </summary>
+        /// <param name="newFileAbsolutePath">追加されたファイルの絶対パス。</param>
+        public static void AddAddedFileAbsolutePath(string newFileAbsolutePath)
+        {
+            EnqueuePath(AddedFilesAbsolutePath, newFileAbsolutePath, nameof(newFileAbsolutePath));
+        }
+
+        /// <summary>
+        /// 削除されたファイルの絶対パスを記録します。
+        /// </summary>
+        /// <param name="oldFileAbsolutePath">削除されたファイルの絶対パス。</param>
+        public static void AddRemovedFileAbsolutePath(string oldFileAbsolutePath)
+        {
+            EnqueuePath(RemovedFilesAbsolutePath, oldFileAbsolutePath, nameof(oldFileAbsolutePath));
+        }
+
+        /// <summary>
+        /// 変更されたファイルの相対パスを記録します。
+        /// </summary>
+        /// <param name="fileRelativePath">変更されたファイルの相対パス。</param>
+        public static void AddModifiedFileRelativePath(string fileRelativePath)
+        {
+            EnqueuePath(ModifiedFilesRelativePath, fileRelativePath, nameof(fileRelativePath));
+        }
+
+        /// <summary>
+        /// 比較結果の静的状態をすべて初期化します。
+        /// </summary>
+        public static void ResetAll()
+        {
+            OldFilesAbsolutePath.Clear();
+            NewFilesAbsolutePath.Clear();
+            UnchangedFilesRelativePath.Clear();
+            AddedFilesAbsolutePath.Clear();
+            RemovedFilesAbsolutePath.Clear();
+            ModifiedFilesRelativePath.Clear();
+            FileRelativePathToDiffDetailDictionary.Clear();
+            FileRelativePathToIlDisassemblerLabelDictionary.Clear();
+            IgnoredFilesRelativePathToLocation.Clear();
+            DisassemblerToolVersions.Clear();
+            DisassemblerToolVersionsFromCache.Clear();
+        }
+
         /// <summary>
         /// ファイルの比較結果を記録します。
         /// </summary>
@@ -162,5 +234,42 @@ public static void RecordDisassemblerToolVersion(string toolName, string version
             var target = fromCache ? DisassemblerToolVersionsFromCache : DisassemblerToolVersions;
             target[label] = 0;
         }
+
+        /// <summary>
+        /// スレッドセーフキュー内の要素を指定した内容で置き換えます。
+        /// </summary>
+        /// <param name="targetQueue">置き換え先キュー。</param>
+        /// <param name="items">置き換える要素。</param>
+        /// <param name="paramName">null チェック用の引数名。</param>
+        /// <exception cref="ArgumentNullException">items が null の場合。</exception>
+        private static void ReplaceQueueItems(ConcurrentQueue<string> targetQueue, IEnumerable<string> items, string paramName)
+        {
+            if (items is null)
+            {
+                throw new ArgumentNullException(paramName);
+            }
+
+            targetQueue.Clear();
+            foreach (var item in items)
+            {
+                EnqueuePath(targetQueue, item, paramName);
+            }
+        }
+
+        /// <summary>
+        /// null でないことを確認してキューに追加します。
+        /// </summary>
+        /// <param name="targetQueue">追加先キュー。</param>
+        /// <param name="path">追加するパス。</param>
+        /// <param name="paramName">null チェック用の引数名。</param>
+        /// <exception cref="ArgumentNullException">path が null の場合。</exception>
+        private static void EnqueuePath(ConcurrentQueue<string> targetQueue, string path, string paramName)
+        {
+            if (path is null)
+            {
+                throw new ArgumentNullException(paramName);
+            }
+            targetQueue.Enqueue(path);
+        }
     }
 }

README.en.md

@@ -71,6 +71,8 @@ Relation to CI:
 - Recursively compares the old folder (CLI arg #1) and the new folder (CLI arg #2).
 - Tracks each file as `MD5Match`, `MD5Mismatch`, `ILMatch`, `ILMismatch`, `TextMatch`, or `TextMismatch` (for IL results, the used disassembler/version is also recorded).
 - Groups files into `Unchanged`, `Added`, `Removed`, and `Modified` buckets.
+- Uses `ConcurrentQueue` / `ConcurrentDictionary` inside `FileDiffResultLists` so result aggregation is thread-safe during parallel comparison.
+- Calls `FileDiffResultLists.ResetAll()` at the start of `FolderDiffService.ExecuteFolderDiffAsync` to prevent state leakage across multiple runs in the same process.
 - Writes per-bucket listings to `Reports/<report label>/diff_report.md`; paths are relative for `Unchanged`/`Modified` and absolute for `Added`/`Removed`.
 - For `ILMatch` / `ILMismatch`, the report also includes the disassembler tool and version used (including cache hits).
 - Summarizes counts per bucket in the same report.

README.md

@@ -79,6 +79,8 @@ CI との関係:
     - TextMatch: テキストベースで一致
     - TextMismatch: テキストベースで不一致
 - 比較結果区分ごと（Unchanged/Added/Removed/Modified）にファイルを分類
+- 比較結果の内部保持（`FileDiffResultLists`）は `ConcurrentQueue` / `ConcurrentDictionary` を使用し、並列実行時の追加処理をスレッドセーフに実行
+- `FolderDiffService.ExecuteFolderDiffAsync` の開始時に `FileDiffResultLists.ResetAll()` を実行し、同一プロセス内の複数回比較でも前回結果が混入しないように初期化
 - 比較結果区分ごとのファイル一覧を`Reports/<コマンドライン第3引数に指定したレポートのラベル>/diff_report.md`に出力（ファイルのパス、最終更新日時［`config.json`のShouldOutputFileTimestampsが `true` の場合］、判定根拠）
     - Unchanged/Modified は相対パスで記載されます。
     - Added/Removed は絶対パスで記載されます。