Merge remote-tracking branch 'origin/main'

.github/FUNDING.yml

@@ -1 +1,2 @@
 github: Ellpeck
+ko_fi: Ellpeck

Coroutine/Coroutine.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFrameworks>net45;netstandard2.0;net6.0</TargetFrameworks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
     
@@ -13,11 +13,15 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageIcon>Logo.png</PackageIcon>
-        <VersionPrefix>2.1.2</VersionPrefix>
+        <VersionPrefix>2.1.4</VersionPrefix>
     </PropertyGroup>
     
     <ItemGroup>
         <None Include="../README.md" Pack="true" PackagePath="" />
         <None Include="../Logo.png" Pack="true" PackagePath="" />
     </ItemGroup>
+    
+    <ItemGroup Condition="'$(TargetFramework)'=='net45'">
+        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    </ItemGroup>
 </Project>

Coroutine/CoroutineHandlerInstance.cs

@@ -16,15 +16,26 @@ namespace Coroutine {
         private readonly HashSet<ActiveCoroutine> outstandingEventCoroutines = new HashSet<ActiveCoroutine>();
         private readonly HashSet<ActiveCoroutine> outstandingTickingCoroutines = new HashSet<ActiveCoroutine>();
         private readonly Stopwatch stopwatch = new Stopwatch();
+        private readonly object lockObject = new object();
 
         /// <summary>
         /// The amount of <see cref="ActiveCoroutine"/> instances that are currently waiting for a tick (waiting for time to pass)
         /// </summary>
-        public int TickingCount => this.tickingCoroutines.Count;
+        public int TickingCount {
+            get {
+                lock (this.lockObject)
+                    return this.tickingCoroutines.Count;
+            }
+        }
         /// <summary>
         /// The amount of <see cref="ActiveCoroutine"/> instances that are currently waiting for an <see cref="Event"/>
         /// </summary>
-        public int EventCount => this.eventCoroutines.Sum(c => c.Value.Count);
+        public int EventCount {
+            get {
+                lock (this.lockObject)
+                    return this.eventCoroutines.Sum(c => c.Value.Count);
+            }
+        }
 
         /// <summary>
         /// Starts the given coroutine, returning a <see cref="ActiveCoroutine"/> object for management.
@@ -47,8 +58,10 @@ namespace Coroutine {
         /// <returns>An active coroutine object representing this coroutine</returns>
         public ActiveCoroutine Start(IEnumerator<Wait> coroutine, string name = "", int priority = 0) {
             var inst = new ActiveCoroutine(coroutine, name, priority, this.stopwatch);
-            if (inst.MoveNext())
-                this.GetOutstandingCoroutines(inst.IsWaitingForEvent).Add(inst);
+            if (inst.MoveNext()) {
+                lock (this.lockObject)
+                    this.GetOutstandingCoroutines(inst.IsWaitingForEvent).Add(inst);
+            }
             return inst;
         }
 
@@ -70,16 +83,18 @@ namespace Coroutine {
         /// </summary>
         /// <param name="deltaSeconds">The amount of seconds that have passed since the last time this method was invoked</param>
         public void Tick(double deltaSeconds) {
-            this.MoveOutstandingCoroutines(false);
-            this.tickingCoroutines.RemoveAll(c => {
-                if (c.Tick(deltaSeconds)) {
-                    return true;
-                } else if (c.IsWaitingForEvent) {
-                    this.outstandingEventCoroutines.Add(c);
-                    return true;
-                }
-                return false;
-            });
+            lock (this.lockObject) {
+                this.MoveOutstandingCoroutines(false);
+                this.tickingCoroutines.RemoveAll(c => {
+                    if (c.Tick(deltaSeconds)) {
+                        return true;
+                    } else if (c.IsWaitingForEvent) {
+                        this.outstandingEventCoroutines.Add(c);
+                        return true;
+                    }
+                    return false;
+                });
+            }
         }
 
         /// <summary>
@@ -96,19 +111,21 @@ namespace Coroutine {
         /// </summary>
         /// <param name="evt">The event to raise</param>
         public void RaiseEvent(Event evt) {
-            this.MoveOutstandingCoroutines(true);
-            var coroutines = this.GetEventCoroutines(evt, false);
-            if (coroutines != null) {
-                for (var i = 0; i < coroutines.Count; i++) {
-                    var c = coroutines[i];
-                    var tup = (c.Event, c);
-                    if (this.eventCoroutinesToRemove.Contains(tup))
-                        continue;
-                    if (c.OnEvent(evt)) {
-                        this.eventCoroutinesToRemove.Add(tup);
-                    } else if (!c.IsWaitingForEvent) {
-                        this.eventCoroutinesToRemove.Add(tup);
-                        this.outstandingTickingCoroutines.Add(c);
+            lock (this.lockObject) {
+                this.MoveOutstandingCoroutines(true);
+                var coroutines = this.GetEventCoroutines(evt, false);
+                if (coroutines != null) {
+                    for (var i = 0; i < coroutines.Count; i++) {
+                        var c = coroutines[i];
+                        var tup = (c.Event, c);
+                        if (this.eventCoroutinesToRemove.Contains(tup))
+                            continue;
+                        if (c.OnEvent(evt)) {
+                            this.eventCoroutinesToRemove.Add(tup);
+                        } else if (!c.IsWaitingForEvent) {
+                            this.eventCoroutinesToRemove.Add(tup);
+                            this.outstandingTickingCoroutines.Add(c);
+                        }
                     }
                 }
             }
@@ -119,7 +136,8 @@ namespace Coroutine {
         /// </summary>
         /// <returns>All active coroutines</returns>
         public IEnumerable<ActiveCoroutine> GetActiveCoroutines() {
-            return this.tickingCoroutines.Concat(this.eventCoroutines.Values.SelectMany(c => c));
+            lock (this.lockObject)
+                return this.tickingCoroutines.Concat(this.eventCoroutines.Values.SelectMany(c => c));
         }
 
         private void MoveOutstandingCoroutines(bool evt) {

Example/Example.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <OutputType>Exe</OutputType>
         <IsPackable>false</IsPackable>
     </PropertyGroup>

README.md

@@ -11,8 +11,8 @@ There are two predefined ways to pause a coroutine:
 
 Additionally, Coroutine provides the following features:
 - Creation of custom events to wait for
-- Creation of custom wait conditions
 - No multi-threading, which allows for any kind of process to be executed in a coroutine, including rendering
+- Thread-safety, which allows for coroutines to be started from different threads
 
 # How to Use
 ## Setting up the CoroutineHandler

Tests/Tests.csproj

@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <VSTestLogger>nunit</VSTestLogger>
     </PropertyGroup>
-
+    
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="3.0.3" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
-        <PackageReference Include="NUnit" Version="3.13.1" />
-        <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-        <PackageReference Include="NunitXml.TestLogger" Version="3.0.97" />
+        <PackageReference Include="coverlet.collector" Version="3.1.2" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
+        <PackageReference Include="NUnit" Version="3.13.3" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+        <PackageReference Include="NunitXml.TestLogger" Version="3.0.127" />
     </ItemGroup>
-
+    
     <ItemGroup>
         <ProjectReference Include="..\Coroutine\Coroutine.csproj" />
     </ItemGroup>