Changes towards supporting multiple threads properly

Author: svermeulen

UnityProject/Assets/AsyncUtil/Source/AsyncMonoBehaviourEvents.cs

@@ -4,6 +4,7 @@
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using UnityEngine;
+using UnityAsyncAwaitUtil;
 
 // We could just add a generic GetAwaiter to YieldInstruction and CustomYieldInstruction
 // but instead we add specific methods to each derived class to allow for return values
@@ -20,6 +21,11 @@ public static TaskAwaiter<object> GetAwaiter(this WaitForSeconds instruction)
         return GetAwaiterReturnNull(instruction);
     }
 
+    public static TaskAwaiter<object> GetAwaiter(this WaitForUpdate instruction)
+    {
+        return GetAwaiterReturnNull(instruction);
+    }
+
     public static TaskAwaiter<object> GetAwaiter(this WaitForEndOfFrame instruction)
     {
         return GetAwaiterReturnNull(instruction);
@@ -48,7 +54,7 @@ public static TaskAwaiter<object> GetAwaiter(this WaitWhile instruction)
     public static TaskAwaiter<UnityEngine.Object> GetAwaiter(this ResourceRequest instruction)
     {
         var tcs = new TaskCompletionSource<UnityEngine.Object>();
-        AsyncMonoBehaviourEvents.Instance.StartCoroutine(
+        AsyncCoroutineRunner.Instance.StartCoroutine(
             InstructionWrappers.ResourceRequest(tcs, instruction));
         return tcs.Task.GetAwaiter();
     }
@@ -67,15 +73,15 @@ public static TaskAwaiter<WWW> GetAwaiter(this WWW instruction)
     public static TaskAwaiter<AssetBundle> GetAwaiter(this AssetBundleCreateRequest instruction)
     {
         var tcs = new TaskCompletionSource<AssetBundle>();
-        AsyncMonoBehaviourEvents.Instance.StartCoroutine(
+        AsyncCoroutineRunner.Instance.StartCoroutine(
             InstructionWrappers.AssetBundleCreateRequest(tcs, instruction));
         return tcs.Task.GetAwaiter();
     }
 
     public static TaskAwaiter<UnityEngine.Object> GetAwaiter(this AssetBundleRequest instruction)
     {
         var tcs = new TaskCompletionSource<UnityEngine.Object>();
-        AsyncMonoBehaviourEvents.Instance.StartCoroutine(
+        AsyncCoroutineRunner.Instance.StartCoroutine(
             InstructionWrappers.AssetBundleRequest(tcs, instruction));
         return tcs.Task.GetAwaiter();
     }
@@ -84,7 +90,7 @@ public static TaskAwaiter<object> GetAwaiter(this IEnumerator coroutine)
     {
         var tcs = new TaskCompletionSource<object>();
         var wrapper = new CoroutineWrapper(coroutine, tcs);
-        AsyncMonoBehaviourEvents.Instance.StartCoroutine(wrapper.Run());
+        AsyncCoroutineRunner.Instance.StartCoroutine(wrapper.Run());
         return tcs.Task.GetAwaiter();
     }
 
@@ -95,15 +101,15 @@ public static TaskAwaiter<object> GetAwaiter(this IEnumerator coroutine)
     static TaskAwaiter<object> GetAwaiterReturnNull(object instruction)
     {
         var tcs = new TaskCompletionSource<object>();
-        AsyncMonoBehaviourEvents.Instance.StartCoroutine(
+        AsyncCoroutineRunner.Instance.StartCoroutine(
             InstructionWrappers.ReturnNullValue(tcs, instruction));
         return tcs.Task.GetAwaiter();
     }
 
     static TaskAwaiter<T> GetAwaiterReturnSelf<T>(T instruction)
     {
         var tcs = new TaskCompletionSource<T>();
-        AsyncMonoBehaviourEvents.Instance.StartCoroutine(
+        AsyncCoroutineRunner.Instance.StartCoroutine(
             InstructionWrappers.ReturnSelf(tcs, instruction));
         return tcs.Task.GetAwaiter();
     }

UnityProject/Assets/AsyncUtil/Source/IEnumeratorAwaitExtensions.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+
+namespace UnityAsyncAwaitUtil
+{
+    public class AsyncCoroutineRunner : MonoBehaviour
+    {
+        static AsyncCoroutineRunner _instance;
+
+        public static AsyncCoroutineRunner Instance
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = new GameObject("AsyncCoroutineRunner")
+                        .AddComponent<AsyncCoroutineRunner>();
+                }
+
+                return _instance;
+            }
+        }
+
+        void Awake()
+        {
+            // Don't show in scene hierarchy
+            gameObject.hideFlags = HideFlags.HideAndDontSave;
+
+            DontDestroyOnLoad(gameObject);
+        }
+    }
+}

UnityProject/Assets/AsyncUtil/Source/Internal.meta

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using UnityEngine;
+
+// This can be used as a way to return to the main unity thread when using multiple threads
+// with async methods
+public class WaitForUpdate : CustomYieldInstruction
+{
+    public override bool keepWaiting
+    {
+        get { return false; }
+    }
+}

UnityProject/Assets/AsyncUtil/Source/Internal/AsyncCoroutineRunner.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEngine;
+
+public class AsyncExample : MonoBehaviour
+{
+    async void Start()
+    {
+        Debug.Log("Thread: " + Thread.CurrentThread.ManagedThreadId);
+
+        await Task.Delay(TimeSpan.FromSeconds(1.0f)).ConfigureAwait(false);
+
+        Debug.Log("Thread: " + Thread.CurrentThread.ManagedThreadId);
+    }
+}