More on thread management

Author: aleab

Aleab.Common

@@ -12,6 +12,7 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Threading;
+using Aleab.Common.Extensions;
 using Castle.MicroKernel.Registration;
 using Castle.Windsor;
 using JetBrains.Annotations;

Toastify/src/App.xaml.cs

@@ -77,7 +77,7 @@ protected override void Authorize()
 
         public override Task<IToken> GetToken()
         {
-            return this.authHttpServer == null ? null : base.GetToken();
+            return this.authHttpServer == null ? Task.FromResult((IToken)null) : base.GetToken();
         }
 
         protected override IToken CreateToken(SpotifyTokenResponse spotifyTokenResponse)

Toastify/src/Core/Auth/ToastifyWebAuth.cs

@@ -71,15 +71,23 @@ public void Add(Thread thread)
         {
             if (thread == null)
                 return;
-            this.threads.Remove(thread);
-            this.threads.Add(thread);
+
+            lock (instanceLock)
+            {
+                this.threads.Remove(thread);
+                this.threads.Add(thread);
+            }
         }
 
         public void Remove(Thread thread)
         {
             if (thread == null)
                 return;
-            this.threads.Remove(thread);
+
+            lock (instanceLock)
+            {
+                this.threads.Remove(thread);
+            }
         }
 
         public void Abort(Thread thread)
@@ -94,9 +102,12 @@ private void Abort(Thread thread, bool remove)
 
             try
             {
-                if (remove)
-                    this.Remove(thread);
-                thread.Abort();
+                lock (instanceLock)
+                {
+                    if (remove)
+                        this.Remove(thread);
+                    thread.Abort();
+                }
             }
             catch
             {
@@ -110,16 +121,19 @@ private void DeadThreadsCleanerThreadStart()
             {
                 while (!App.ShutdownEvent.WaitOne(TimeSpan.FromSeconds(10)))
                 {
-                    List<Thread> threadsToRemove = new List<Thread>(this.threads.Count);
-                    foreach (var thread in this.threads)
-                    {
-                        if (!thread.IsAlive)
-                            threadsToRemove.Add(thread);
-                    }
-
-                    foreach (var thread in threadsToRemove)
+                    lock (instanceLock)
                     {
-                        this.Remove(thread);
+                        List<Thread> threadsToRemove = new List<Thread>(this.threads.Count);
+                        foreach (var thread in this.threads)
+                        {
+                            if (!thread.IsAlive)
+                                threadsToRemove.Add(thread);
+                        }
+
+                        foreach (var thread in threadsToRemove)
+                        {
+                            this.Remove(thread);
+                        }
                     }
                 }
             }
@@ -131,17 +145,20 @@ private void DeadThreadsCleanerThreadStart()
 
         public void Dispose()
         {
-            if (this.threads != null)
+            lock (instanceLock)
             {
-                foreach (var thread in this.threads)
+                if (this.threads != null)
                 {
-                    this.Abort(thread, false);
+                    foreach (var thread in this.threads)
+                    {
+                        this.Abort(thread, false);
+                    }
+
+                    this.threads.Clear();
                 }
 
-                this.threads.Clear();
+                this.Abort(this.deadThreadsCleaner, false);
             }
-
-            this.Abort(this.deadThreadsCleaner, false);
         }
 
         #region Static Members

Toastify/src/Threading/ThreadManager.cs

@@ -16,7 +16,7 @@ namespace Toastify.Threading
 
         public T Window { get; private set; }
 
-        public Thread Thread { get; }
+        public Thread Thread { get; private set; }
 
         public bool IsBackground
         {
@@ -65,6 +65,7 @@ public void Start()
         public void Abort()
         {
             ThreadManager.Instance.Abort(this.Thread);
+            this.Thread = null;
         }
 
         public void Join()
@@ -101,25 +102,41 @@ public void CloseWindow()
             }
             catch (Exception ex)
             {
-                logger.Error($"Unhandled error while closing {nameof(WindowThread<T>)}'s window{(!string.IsNullOrWhiteSpace(this.Window?.Title) ? $" ({this.Window.Title})" : string.Empty)}", ex);
+                if (this.Window != null)
+                {
+                    this.Window.Dispatcher.Invoke(DispatcherPriority.Normal, new ThreadStart(() =>
+                    {
+                        string title = !string.IsNullOrWhiteSpace(this.Window?.Title) ? $" ({this.Window.Title})" : string.Empty;
+                        logger.Error($"Unhandled error while closing {nameof(WindowThread<T>)}'s window{title}", ex);
+                    }));
+                }
+                else
+                    logger.Error($"Unhandled error while closing {nameof(WindowThread<T>)}'s window", ex);
             }
         }
 
         private void ThreadStart()
         {
+            var syncContext = SynchronizationContext.Current;
+            SynchronizationContext.SetSynchronizationContext(new DispatcherSynchronizationContext(Dispatcher.CurrentDispatcher));
+
             try
             {
-                var syncContext = SynchronizationContext.Current;
-                SynchronizationContext.SetSynchronizationContext(new DispatcherSynchronizationContext(Dispatcher.CurrentDispatcher));
-
                 this.Window = new T();
                 this.options?.WindowInitialization?.Invoke(this.Window);
 
                 this.Window.Closed += (sender, args) =>
                 {
-                    Application.Current?.Dispatcher?.BeginInvoke(new Action(() => Application.Current.Exit -= this.Application_Exit));
-                    this.options?.OnWindowClosingAction?.Invoke(this);
-                    this.Window?.Dispatcher?.BeginInvokeShutdown(DispatcherPriority.Background);
+                    try
+                    {
+                        Application.Current?.Dispatcher?.BeginInvoke(new Action(() => Application.Current.Exit -= this.Application_Exit));
+                        this.options?.OnWindowClosingAction?.Invoke(this);
+                        this.Window?.Dispatcher?.BeginInvokeShutdown(DispatcherPriority.Background);
+                    }
+                    catch
+                    {
+                        // ignore
+                    }
                 };
                 Application.Current?.Dispatcher?.Invoke(() => Application.Current.Exit += this.Application_Exit);
 
@@ -128,7 +145,6 @@ private void ThreadStart()
                 this.options?.AfterWindowShownAction?.Invoke(this.Window);
 
                 Dispatcher.Run();
-                SynchronizationContext.SetSynchronizationContext(syncContext);
             }
             catch (ThreadAbortException)
             {
@@ -141,11 +157,13 @@ private void ThreadStart()
             {
                 this.CloseWindow();
                 Dispatcher.CurrentDispatcher.BeginInvokeShutdown(DispatcherPriority.Background);
+                SynchronizationContext.SetSynchronizationContext(syncContext);
             }
         }
 
         public override int GetHashCode()
         {
+            // ReSharper disable once NonReadonlyMemberInGetHashCode
             return this.Thread?.GetHashCode() ?? 0;
         }
 

Toastify/src/Threading/WindowThread.cs

@@ -84,8 +84,15 @@ private string GetAdditionalHeaders(Dictionary<string, string> additionalHeaders
 
         private void WebView_OnClosing(object sender, EventArgs e)
         {
-            this.WebBrowser.Dispatcher.InvokeShutdown();
-            this.WebBrowser.Dispose();
+            try
+            {
+                this.WebBrowser.Dispatcher.InvokeShutdown();
+                this.WebBrowser.Dispose();
+            }
+            catch
+            {
+                // ignore
+            }
         }
 
         private void WebBrowser_OnLoadCompleted(object sender, NavigationEventArgs e)

Toastify/src/View/WebView.xaml.cs

@@ -46,7 +46,11 @@ public virtual async Task<IToken> GetToken()
             }
 
             if (shouldAbortAuthorization)
+            {
+                this.AuthHttpServer.AuthorizationFinished -= this.AuthHttpServer_AuthorizationFinished;
+                await this.AuthHttpServer.Stop().ConfigureAwait(false);
                 return null;
+            }
 
             if (this.authResponse.Error == null && !string.IsNullOrWhiteSpace(this.authResponse.Code))
             {