closes #671 and changes to aborting thread in Dispose instead of attempting to join

Removes explicit call to dispose when program stops. Clears queue in dispose
#671 switches to private Dispose() on program stop
2026-02-11 02:35:00 +00:00 · 2021-04-06 10:38:39 -06:00 · 2021-03-31 16:35:33 -06:00 · 2021-03-30 15:56:05 -06:00 · 2021-03-29 13:17:51 -06:00
1 changed files with 20 additions and 10 deletions
--- a/Core/PepperDashEssentialsBase/Queues/GenericQueue.cs
+++ b/Core/PepperDashEssentialsBase/Queues/GenericQueue.cs
@@ -14,7 +14,7 @@ namespace PepperDash.Essentials.Core.Queues
        protected readonly CrestronQueue<IQueueMessage> _queue;
        protected readonly Thread _worker;
        protected readonly CEvent _waitHandle = new CEvent();
-        
+
        private bool _delayEnabled;
        private int _delayTime;

@@ -155,10 +155,10 @@ namespace PepperDash.Essentials.Core.Queues
                if (programEvent != eProgramStatusEventType.Stopping)
                    return;

-                Dispose();
+                Dispose(true);
            };
        }
-        
+
        /// <summary>
        /// Thread callback
        /// </summary>
@@ -231,8 +231,13 @@ namespace PepperDash.Essentials.Core.Queues

            if (disposing)
            {
-                Enqueue(null);
-                _worker.Join();
+                Debug.Console(2, this, "Disposing...");
+                if (_queue != null && !_queue.Disposed)
+                {
+                    _queue.Clear();
+                    Enqueue(null);
+                }
+                _worker.Abort();
                _waitHandle.Close();
            }

@@ -241,7 +246,7 @@ namespace PepperDash.Essentials.Core.Queues

        ~GenericQueue()
        {
-            Dispose(false);
+            Dispose(true);
        }

        /// <summary>
@@ -407,7 +412,7 @@ namespace PepperDash_Essentials_Core.Queues
                if (programEvent != eProgramStatusEventType.Stopping)
                    return;

-                Dispose();
+                Dispose(true);
            };
        }

@@ -477,8 +482,13 @@ namespace PepperDash_Essentials_Core.Queues

            if (disposing)
            {
-                Enqueue(null);
-                _worker.Join();
+                Debug.Console(2, this, "Disposing...");
+                if (_queue != null && !_queue.Disposed)
+                {
+                    _queue.Clear();
+                    Enqueue(null);
+                }
+                _worker.Abort();
                _waitHandle.Close();
            }

@@ -487,7 +497,7 @@ namespace PepperDash_Essentials_Core.Queues

        ~GenericQueue()
        {
-            Dispose(false);
+            Dispose(true);
        }

        /// <summary>
Author	SHA1	Message	Date
Neil Dorin	200080247a	closes #671 and changes to aborting thread in Dispose instead of attempting to join	2021-04-06 10:38:39 -06:00
Neil Dorin	2feec62052	Removes explicit call to dispose when program stops. Clears queue in dispose	2021-03-31 16:35:33 -06:00
Neil Dorin	955d68b3f3	#671 switches to private Dispose() on program stop	2021-03-30 15:56:05 -06:00
Andrew Welker	185f03065e	Merge pull request #669 from PepperDash/hotfix/dm-routing-issues Fix LinkToApi methods for chassis to use ExecuteNumericSwitch	2021-03-29 13:17:51 -06:00