MontoyaTech/Parallel.Net
MontoyaTech/Parallel.Net
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up code and fixed a few issues.

Browse Source
This commit is contained in:
MattMo 2023-07-24 11:46:58 -07:00
parent ffaee93aa6
commit 779ceee2c1
4 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Parallel.Net.Tests/Parallel.Net.Tests.csproj
View File

@ -2,9 +2,8 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>disable</Nullable>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<AssemblyName>MontoyaTech.Parallel.Net.Tests</AssemblyName>

4
Parallel.Net/Parallel.Net.csproj
View File

@ -2,8 +2,8 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>disable</Nullable>
<AssemblyName>MontoyaTech.Parallel.Net</AssemblyName>
<RootNamespace>MontoyaTech.Parallel.Net</RootNamespace>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>

17
Parallel.Net/ParallelTask.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace MontoyaTech.Parallel.Net
@ -55,16 +56,24 @@ namespace MontoyaTech.Parallel.Net
}
}
/// <summary>
/// Whether or not this parallel task is running.
/// </summary>
protected bool running = false;
/// <summary>
/// Whether or not this parallel task has completed successfully.
/// </summary>
protected bool completed = false;
/// <summary>
/// Whether or not this parallel task failed due to an exception.
/// </summary>
protected bool failed = false;
protected bool exceptionStopped = false;
protected ManualResetEvent handle;
/// <summary>
/// The thrown exception for this parallel task if any.
/// </summary>
protected Exception thrownException = null;
/// <summary>

32
Parallel.Net/ParallelTaskT.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace MontoyaTech.Parallel.Net
@ -24,10 +25,19 @@ namespace MontoyaTech.Parallel.Net
}
}
/// <summary>
/// The result of this parallel task.
/// </summary>
protected ResultT result = default(ResultT);
/// <summary>
/// The function to run when this task is ran.
/// </summary>
protected Func<InputT, ResultT> func = null;
/// <summary>
/// The input to pass to the function when this task is ran.
/// </summary>
protected InputT input = default(InputT);
/// <summary>
@ -55,7 +65,7 @@ namespace MontoyaTech.Parallel.Net
{
this.running = true;
this.handle = new ManualResetEvent(false);
var handle = new ManualResetEvent(false);
ThreadPool.QueueUserWorkItem((object state) =>
{
@ -72,7 +82,7 @@ namespace MontoyaTech.Parallel.Net
this.thrownException = ex;
}
this.handle.Set();
handle.Set();
if (countDown != null)
countDown.Signal();
@ -82,8 +92,8 @@ namespace MontoyaTech.Parallel.Net
if (blocking)
{
if (!timeout.HasValue)
this.handle.WaitOne();
else if (!this.handle.WaitOne(timeout.Value) && throwOnTimeout)
handle.WaitOne();
else if (!handle.WaitOne(timeout.Value) && throwOnTimeout)
throw new Exception($"ParallelTask did not complete within {timeout.Value.TotalMilliseconds} miliseconds");
}
@ -97,8 +107,14 @@ namespace MontoyaTech.Parallel.Net
/// <typeparam name="InputT"></typeparam>
public class ParallelTask<InputT> : ParallelTask
{
/// <summary>
/// The action to be ran when this task is run.
/// </summary>
protected Action<InputT> action = null;
/// <summary>
/// The input to pass to the action when ran.
/// </summary>
protected InputT input = default(InputT);
/// <summary>
@ -125,7 +141,7 @@ namespace MontoyaTech.Parallel.Net
{
this.running = true;
this.handle = new ManualResetEvent(false);
var handle = new ManualResetEvent(false);
ThreadPool.QueueUserWorkItem((object state) =>
{
@ -142,7 +158,7 @@ namespace MontoyaTech.Parallel.Net
this.thrownException = ex;
}
this.handle.Set();
handle.Set();
if (countDown != null)
countDown.Signal();
@ -152,8 +168,8 @@ namespace MontoyaTech.Parallel.Net
if (blocking)
{
if (!timeout.HasValue)
this.handle.WaitOne();
else if (!this.handle.WaitOne(timeout.Value) && throwOnTimeout)
handle.WaitOne();
else if (!handle.WaitOne(timeout.Value) && throwOnTimeout)
throw new Exception($"ParallelTask did not complete within {timeout.Value.TotalMilliseconds} miliseconds");
}
}