Merge branch 'Nekromateion-indexer-patcher-thread-limits'

# Conflicts: # AdGoBye/Settings.cs # AdGoBye/appsettings.json
Myrkie · Jun 26, 2024 · 6c1e79e · 6c1e79e
2 parents 3e6c34a + c8ea08e
commit 6c1e79e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/AdGoBye/Indexer.cs b/AdGoBye/Indexer.cs
@@ -94,7 +94,7 @@ public static void AddToIndex(string path)
  public static void AddToIndex(IEnumerable<DirectoryInfo?> paths)
  {
  ConcurrentBag<Content> contents = [];
- Parallel.ForEach(paths, path =>
+ Parallel.ForEach(paths, new ParallelOptions { MaxDegreeOfParallelism = Settings.Options.MaxIndexerThreads }, path =>
  {
  if (path != null && AddToIndexPart1(path.FullName, out var content) && content != null)
  {

diff --git a/AdGoBye/Program.cs b/AdGoBye/Program.cs
@@ -46,7 +46,8 @@
 logger.Information("Loaded blocks for {blockCount} worlds and indexed {indexCount} pieces of content",
  Blocklist.Blocks?.Count, db.Content.Count());
 
-Parallel.ForEach(db.Content.Include(content => content.VersionMeta), content =>
+Parallel.ForEach(db.Content.Include(content => content.VersionMeta),
+ new ParallelOptions { MaxDegreeOfParallelism = Settings.Options.MaxPatchThreads }, content =>
 {
  if (content.Type != ContentType.World) return;
  Indexer.PatchContent(content);

diff --git a/AdGoBye/Settings.cs b/AdGoBye/Settings.cs
@@ -30,6 +30,8 @@ public class SettingsOptions
  public bool DisablePluginInstallWarning { get; set; }
  public bool DisableBackupFile { get; set; }
  public bool EnableRecompression { get; set; }
+ public int MaxIndexerThreads { get; set; }
+ public int MaxPatchThreads { get; set; }
  public int RecompressionMemoryMaxMB { get; set; }
  public int ZipBombSizeLimitMB { get; set; }
  }

diff --git a/AdGoBye/appsettings.json b/AdGoBye/appsettings.json
@@ -12,6 +12,8 @@
  "BlocklistURLs": [],
  "DisablePluginInstallWarning": false,
  "EnableRecompression": true,
+ "MaxIndexerThreads": 16,
+ "MaxPatchThreads": 16,
  "RecompressionMemoryMaxMB": 250,
  "ZipBombSizeLimitMB": 8000
  },