From 50ebd283ddc8d644626d8c002a10fb1f3c13b7e9 Mon Sep 17 00:00:00 2001
From: "servarr[bot]" <68984020+servarr[bot]@users.noreply.github.com>
Date: Mon, 22 Mar 2021 23:21:15 +0000
Subject: [PATCH] Fixed: Unnecessary idle cpu usage

sonarr ref 4386

(cherry picked from commit 5a69801877eb72899dd9867c39a1b88b7114fe5b)

Co-authored-by: Taloth Saldono <Taloth@users.noreply.github.com>
---
 .../Messaging/Commands/CommandQueue.cs        | 35 +++++++++++++++++--
 .../Messaging/Commands/CommandQueueManager.cs |  4 +++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/NzbDrone.Core/Messaging/Commands/CommandQueue.cs b/src/NzbDrone.Core/Messaging/Commands/CommandQueue.cs
index de526541f..7c3475757 100644
--- a/src/NzbDrone.Core/Messaging/Commands/CommandQueue.cs
+++ b/src/NzbDrone.Core/Messaging/Commands/CommandQueue.cs
@@ -23,6 +23,8 @@ namespace NzbDrone.Core.Messaging.Commands
             lock (_mutex)
             {
                 _items.Add(item);
+
+                Monitor.PulseAll(_mutex);
             }
         }
 
@@ -68,6 +70,8 @@ namespace NzbDrone.Core.Messaging.Commands
                 {
                     _items.Remove(command);
                 }
+
+                Monitor.PulseAll(_mutex);
             }
         }
 
@@ -83,6 +87,8 @@ namespace NzbDrone.Core.Messaging.Commands
                 {
                     _items.Remove(command);
                     rval = true;
+
+                    Monitor.PulseAll(_mutex);
                 }
             }
 
@@ -102,14 +108,39 @@ namespace NzbDrone.Core.Messaging.Commands
 
         public IEnumerable<CommandModel> GetConsumingEnumerable(CancellationToken cancellationToken)
         {
+            cancellationToken.Register(PulseAllConsumers);
+
             while (!cancellationToken.IsCancellationRequested)
             {
-                if (TryGet(out var command))
+                CommandModel command = null;
+
+                lock (_mutex)
+                {
+                    if (cancellationToken.IsCancellationRequested)
+                    {
+                        break;
+                    }
+
+                    if (!TryGet(out command))
+                    {
+                        Monitor.Wait(_mutex);
+                        continue;
+                    }
+                }
+
+                if (command != null)
                 {
                     yield return command;
                 }
+            }
+        }
 
-                Thread.Sleep(10);
+        public void PulseAllConsumers()
+        {
+            // Signal all consumers to reevaluate cancellation token
+            lock (_mutex)
+            {
+                Monitor.PulseAll(_mutex);
             }
         }
 
diff --git a/src/NzbDrone.Core/Messaging/Commands/CommandQueueManager.cs b/src/NzbDrone.Core/Messaging/Commands/CommandQueueManager.cs
index 8d2b62af7..eb4bdcab4 100644
--- a/src/NzbDrone.Core/Messaging/Commands/CommandQueueManager.cs
+++ b/src/NzbDrone.Core/Messaging/Commands/CommandQueueManager.cs
@@ -188,6 +188,8 @@ namespace NzbDrone.Core.Messaging.Commands
         public void Complete(CommandModel command, string message)
         {
             Update(command, CommandStatus.Completed, message);
+
+            _commandQueue.PulseAllConsumers();
         }
 
         public void Fail(CommandModel command, string message, Exception e)
@@ -195,6 +197,8 @@ namespace NzbDrone.Core.Messaging.Commands
             command.Exception = e.ToString();
 
             Update(command, CommandStatus.Failed, message);
+
+            _commandQueue.PulseAllConsumers();
         }
 
         public void Requeue()