SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-02-16 21:37:13 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

Fix ProcessingQueue disposal (fixes #267)

Browse Source
This commit is contained in:
Matt Nadareski
2021-03-31 21:26:55 -07:00
parent 203418eebc
commit eb4e95e5db
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
MPF.Library/Data/ProcessingQueue.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Concurrent;
using System.Threading;
using System.Threading.Tasks;
namespace MPF.Data
@@ -21,11 +22,17 @@ namespace MPF.Data
/// </summary>
private readonly Task ProcessingTask;
/// <summary>
/// Cancellation method for the processing task
/// </summary>
private readonly CancellationTokenSource TokenSource;
public ProcessingQueue(Action<T> customProcessing)
{
this.InternalQueue = new ConcurrentQueue<T>();
this.CustomProcessing = customProcessing;
this.ProcessingTask = Task.Run(() => ProcessQueue());
this.TokenSource = new CancellationTokenSource();
this.ProcessingTask = Task.Run(() => ProcessQueue(), this.TokenSource.Token);
}
/// <summary>
@@ -33,6 +40,8 @@ namespace MPF.Data
/// </summary>
public void Dispose()
{
this.TokenSource.Cancel();
while (!this.ProcessingTask.IsCompleted) ;
this.ProcessingTask.Dispose();
}
@@ -52,12 +61,16 @@ namespace MPF.Data
{
while (true)
{
// If cancellation was requested, just do it
if (this.TokenSource.IsCancellationRequested)
break;
// Nothing in the queue means we get to idle
if (InternalQueue.Count == 0)
if (this.InternalQueue.Count == 0)
continue;
// Get the next item from the queue
if (!InternalQueue.TryDequeue(out T nextItem))
if (!this.InternalQueue.TryDequeue(out T nextItem))
continue;
// Invoke the lambda, if possible