The Free Software Media System - Server Backend & API
Backport pull request #15662 from jellyfin/release-10.11.z
SapientGuardian8a0b963d2cf7
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.mdindex d475dbba76..43954c0837 100644--- a/CONTRIBUTORS.md+++ b/CONTRIBUTORS.md@@ -117,6 +117,7 @@- [sachk](https://github.com/sachk)- [sammyrc34](https://github.com/sammyrc34)- [samuel9554](https://github.com/samuel9554)+ - [SapientGuardian](https://github.com/SapientGuardian)- [scheidleon](https://github.com/scheidleon)- [sebPomme](https://github.com/sebPomme)- [SegiH](https://github.com/SegiH)diff --git a/MediaBrowser.Controller/LibraryTaskScheduler/LimitedConcurrencyLibraryScheduler.cs b/MediaBrowser.Controller/LibraryTaskScheduler/LimitedConcurrencyLibraryScheduler.csindex 0de5f198d7..5c805e9e49 100644--- a/MediaBrowser.Controller/LibraryTaskScheduler/LimitedConcurrencyLibraryScheduler.cs+++ b/MediaBrowser.Controller/LibraryTaskScheduler/LimitedConcurrencyLibraryScheduler.cs@@ -4,6 +4,7 @@ using System.Collections.Generic;using System.Diagnostics;using System.Linq;using System.Threading;+using System.Threading.Channels;using System.Threading.Tasks;using MediaBrowser.Controller.Configuration;using Microsoft.Extensions.Hosting;@@ -29,7 +30,7 @@ public sealed class LimitedConcurrencyLibraryScheduler : ILimitedConcurrencyLibr/// </summary>private readonly Lock _taskLock = new();- private readonly BlockingCollection<TaskQueueItem> _tasks = new();+ private readonly Channel<TaskQueueItem> _tasks = Channel.CreateUnbounded<TaskQueueItem>();private volatile int _workCounter;private Task? _cleanupTask;@@ -77,7 +78,7 @@ public sealed class LimitedConcurrencyLibraryScheduler : ILimitedConcurrencyLibrlock (_taskLock){- if (_tasks.Count > 0 || _workCounter > 0)+ if (_tasks.Reader.Count > 0 || _workCounter > 0){_logger.LogDebug("Delay cleanup task, operations still running.");// tasks are still there so its still in use. Reschedule cleanup task.@@ -144,9 +145,9 @@ public sealed class LimitedConcurrencyLibraryScheduler : ILimitedConcurrencyLibr_deadlockDetector.Value = stopToken.TaskStop;try{- foreach (var item in _tasks.GetConsumingEnumerable(stopToken.GlobalStop.Token))+ while (!stopToken.GlobalStop.Token.IsCancellationRequested){- stopToken.GlobalStop.Token.ThrowIfCancellationRequested();+ var item = await _tasks.Reader.ReadAsync(stopToken.GlobalStop.Token).ConfigureAwait(false);try{var newWorkerLimit = Interlocked.Increment(ref _workCounter) > 0;@@ -264,7 +265,7 @@ public sealed class LimitedConcurrencyLibraryScheduler : ILimitedConcurrencyLibrfor (var i = 0; i < workItems.Length; i++){var item = workItems[i]!;- _tasks.Add(item, CancellationToken.None);+ await _tasks.Writer.WriteAsync(item, CancellationToken.None).ConfigureAwait(false);}if (_deadlockDetector.Value is not null)@@ -304,13 +305,12 @@ public sealed class LimitedConcurrencyLibraryScheduler : ILimitedConcurrencyLibr}_disposed = true;- _tasks.CompleteAdding();+ _tasks.Writer.Complete();foreach (var item in _taskRunners){await item.Key.CancelAsync().ConfigureAwait(false);}- _tasks.Dispose();if (_cleanupTask is not null){await _cleanupTask.ConfigureAwait(false);