Now closes unused serial devices that are not nF devices (#114)

nanoframework · Feb 5, 2018 · db6d38c · db6d38c
1 parent d2cc3c8
commit db6d38c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/source/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/EventHandlerForSerialDevice.cs b/source/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/EventHandlerForSerialDevice.cs
@@ -264,11 +264,20 @@ private void CloseCurrentlyConnectedDevice()
 
                 Debug.WriteLine($"Closing device {_deviceInformation?.Id}");
 
-                var tasks = new List<Task>();
-                tasks.Add(Task.Factory.StartNew(() => _device.Dispose()));
+                // dispose on a Task to give it a timeout to perform the Dispose()
+                // this is required to be able to actually close devices that get stuck with pending tasks on the in/output streams
+                var closeTask = Task.Factory.StartNew(() =>
+                {
+                    // This closes the handle to the device
+                    _device.Dispose();
+                });
 
-                // This closes the handle to the device
-                Task.WaitAll(tasks.ToArray(), 2000);
+                // need to wrap this in try-catch to catch possible AggregateExceptions
+                try
+                {
+                    Task.WaitAll(new Task[] { closeTask }, TimeSpan.FromMilliseconds(1000));
+                }
+                catch { }
 
                 _device = null;
             }

diff --git a/source/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/SerialPort.cs b/source/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/SerialPort.cs
@@ -275,11 +275,13 @@ private async void AddDeviceToList(DeviceInformation deviceInformation, String d
                             else
                             {
                                 Debug.WriteLine("Invalid serial device: " + deviceInformation.Id);
+                                newNanoFrameworkDevice.Disconnect();
                             }
                         }
                         else
                         {
                             Debug.WriteLine("Couldn't connect to serial device: " + deviceInformation.Id);
+                            newNanoFrameworkDevice.Disconnect();
                         }
 
                         // clear tentative list
@@ -414,11 +416,16 @@ private async void OnDeviceEnumerationCompleteAsync(DeviceWatcher sender, object
 
                             NanoFrameworkDevices.Add(device);
                         }
+                        else
+                        {
+                            ((NanoDevice<NanoSerialDevice>)device).Disconnect();
+                        }
                     }
                     else
                     {
                         // couldn't open device
                         Debug.WriteLine($"Checking device: {(((NanoDevice<NanoSerialDevice>)device).Device.DeviceInformation.DeviceInformation.Id)} FAILED");
+                        ((NanoDevice<NanoSerialDevice>)device).Disconnect();
                     }
                 }
 

diff --git a/source/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/Engine.cs b/source/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/Engine.cs
@@ -645,11 +645,12 @@ public void StopProcessing()
             {
                 _backgroundProcessorCancellation.Cancel();
 
+                // need to wrap this in try-catch to catch possible AggregateExceptions
                 try
                 {
                     Task.WaitAll(_backgroundProcessor);
                 }
-                catch (AggregateException) { }
+                catch { }
 
                 _backgroundProcessor = null;
             }