A blocking collection is already thread safe, AutoResetEvent should n…

…ot be required here.
WildernessLabs · Jul 9, 2024 · 205ed23 · 205ed23
1 parent 21f3e1c
commit 205ed23
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/Source/v2/Meadow.Hcom/Connections/SerialConnection.cs b/Source/v2/Meadow.Hcom/Connections/SerialConnection.cs
@@ -264,7 +264,7 @@ private async Task CommandManager()
             }
             else
             {
-                // If no commands are available, delay a bit to avoid busy waiting
+                // If no commands to dequeue, delay a bit to avoid busy waiting
                 await Task.Delay(100);
             }
         }

diff --git a/Source/v2/Meadow.Hcom/Debugging/DebuggingServer.ActiveClient.cs b/Source/v2/Meadow.Hcom/Debugging/DebuggingServer.ActiveClient.cs
@@ -18,7 +18,6 @@ private class ActiveClient : IDisposable
         private readonly ILogger? _logger;
         private bool _disposed;
         private readonly BlockingCollection<byte[]> _debuggerMessages = new();
-        private readonly AutoResetEvent _vsDebugDataReady = new(false);
         private readonly object _disposeLock = new();
 
         internal ActiveClient(IMeadowConnection connection, TcpClient tcpClient, ILogger? logger, CancellationToken? cancellationToken)
@@ -47,7 +46,6 @@ private void MeadowConnection_DebuggerMessageReceived(object sender, byte[] e)
                 if (!_disposed)
                 {
                     _debuggerMessages.Add(e);
-                    _vsDebugDataReady.Set();
                 }
             }
         }
@@ -131,9 +129,7 @@ private async Task SendToVisualStudio()
                 {
                     if (_networkStream != null && _networkStream.CanWrite)
                     {
-                        _vsDebugDataReady.WaitOne(1000);
-
-                        while (_debuggerMessages.TryTake(out var byteData, Timeout.Infinite, _cts.Token))
+                        if (_debuggerMessages.TryTake(out var byteData, Timeout.Infinite, _cts.Token))
                         {
                             _logger?.LogTrace("Received {count} bytes from Meadow, will forward to VS", byteData.Length);
                             if (!_tcpClient.Connected)
@@ -145,6 +141,11 @@ private async Task SendToVisualStudio()
                             await _networkStream.WriteAsync(byteData, 0, byteData.Length, _cts.Token);
                             _logger?.LogTrace("Forwarded {count} bytes to VS", byteData.Length);
                         }
+                        else
+                        {
+                            // If no _debuggerMessages to Take, delay a bit to avoid busy waiting
+                            await Task.Delay(100);
+                        }
                     }
                     else
                     {