pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-04-12 03:57:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Neil Dorin 2021-04-06 10:38:39 -06:00
parent 2feec62052
commit 200080247a
1 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

54
essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/GenericQueue.cs
View file

@ -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;
@ -150,15 +150,15 @@ namespace PepperDash.Essentials.Core.Queues
_delayEnabled = pacing > 0;
_delayTime = pacing;
//CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
//{
// if (programEvent != eProgramStatusEventType.Stopping)
// return;
CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
{
if (programEvent != eProgramStatusEventType.Stopping)
return;
// Dispose(true);
//};
Dispose(true);
};
}
/// <summary>
/// Thread callback
/// </summary>
@ -231,10 +231,13 @@ namespace PepperDash.Essentials.Core.Queues
if (disposing)
{
Debug.Console(2, this, "Disposing...");
_queue.Clear();
Enqueue(null);
_worker.Join();
Debug.Console(2, this, "Disposing...");
if (_queue != null && !_queue.Disposed)
{
_queue.Clear();
Enqueue(null);
}
_worker.Abort();
_waitHandle.Close();
}
@ -243,7 +246,7 @@ namespace PepperDash.Essentials.Core.Queues
~GenericQueue()
{
Dispose(false);
Dispose(true);
}
/// <summary>
@ -404,13 +407,13 @@ namespace PepperDash_Essentials_Core.Queues
_delayEnabled = pacing > 0;
_delayTime = pacing;
//CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
//{
// if (programEvent != eProgramStatusEventType.Stopping)
// return;
CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
{
if (programEvent != eProgramStatusEventType.Stopping)
return;
// Dispose(true);
//};
Dispose(true);
};
}
/// <summary>
@ -479,10 +482,13 @@ namespace PepperDash_Essentials_Core.Queues
if (disposing)
{
Debug.Console(2, this, "Disposing...");
_queue.Clear();
Enqueue(null);
_worker.Join();
Debug.Console(2, this, "Disposing...");
if (_queue != null && !_queue.Disposed)
{
_queue.Clear();
Enqueue(null);
}
_worker.Abort();
_waitHandle.Close();
}
@ -491,7 +497,7 @@ namespace PepperDash_Essentials_Core.Queues
~GenericQueue()
{
Dispose(false);
Dispose(true);
}
/// <summary>