Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed abort call from WorkQueue

Browse Source
This commit is contained in:
Justin Swanson 2019-12-03 18:03:43 -06:00
parent ceebe0b745
commit caadbb0aee
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Wabbajack.Common/WorkQueue.cs
View File

@ -24,6 +24,8 @@ namespace Wabbajack.Common
public static List<Thread> Threads { get; private set; }
private CancellationTokenSource _cancel = new CancellationTokenSource();
public WorkQueue(int threadCount = 0)
{
StartThreads(threadCount == 0 ? Environment.ProcessorCount : threadCount);
@ -51,11 +53,17 @@ namespace Wabbajack.Common
CpuId = idx;
CurrentQueue = this;
while (true)
try
{
while (true)
{
Report("Waiting", 0, false);
var f = Queue.Take(_cancel.Token);
f();
}
}
catch (OperationCanceledException)
{
Report("Waiting", 0, false);
var f = Queue.Take();
f();
}
}
@ -79,7 +87,7 @@ namespace Wabbajack.Common
public void Shutdown()
{
Threads.Do(th => th.Abort());
_cancel.Cancel();
Threads.Do(th => th.Join());
}