From 86ea128bf412b769abae18ce680c61a15dd9b8a8 Mon Sep 17 00:00:00 2001 From: neuecc Date: Mon, 8 Jun 2020 00:30:27 +0900 Subject: [PATCH] t4gen --- .../UniTask/Runtime/UnityAsyncExtensions.cs | 10 ++-- .../UniTask/Runtime/UnityAsyncExtensions.tt | 46 ++++++++++++------- 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.cs b/src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.cs index 23048fc..0483b48 100644 --- a/src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.cs +++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.cs @@ -124,7 +124,6 @@ namespace Cysharp.Threading.Tasks { try { - core.GetResult(token); } finally @@ -133,6 +132,7 @@ namespace Cysharp.Threading.Tasks } } + public UniTaskStatus GetStatus(short token) { return core.GetStatus(token); @@ -306,7 +306,6 @@ namespace Cysharp.Threading.Tasks { try { - return core.GetResult(token); } finally @@ -545,11 +544,11 @@ namespace Cysharp.Threading.Tasks bool TryReturn() { + TaskTracker.RemoveTracking(this); core.Reset(); asyncOperation = default; progress = default; cancellationToken = default; - TaskTracker.RemoveTracking(this); return pool.TryPush(this); } @@ -731,11 +730,11 @@ namespace Cysharp.Threading.Tasks bool TryReturn() { + TaskTracker.RemoveTracking(this); core.Reset(); asyncOperation = default; progress = default; cancellationToken = default; - TaskTracker.RemoveTracking(this); return pool.TryPush(this); } @@ -866,7 +865,6 @@ namespace Cysharp.Threading.Tasks { try { - return core.GetResult(token); } finally @@ -920,11 +918,11 @@ namespace Cysharp.Threading.Tasks bool TryReturn() { + TaskTracker.RemoveTracking(this); core.Reset(); asyncOperation = default; progress = default; cancellationToken = default; - TaskTracker.RemoveTracking(this); return pool.TryPush(this); } diff --git a/src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.tt b/src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.tt index f99351f..218836e 100644 --- a/src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.tt +++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.tt @@ -37,7 +37,7 @@ namespace Cysharp.Threading.Tasks <# if(t.returnType == "UnityWebRequest") { #> #if ENABLE_UNITYWEBREQUEST <# } #> -#region <#= t.typeName #> + #region <#= t.typeName #> public static <#= t.typeName #>Awaiter GetAwaiter(this <#= t.typeName #> asyncOperation) { @@ -45,18 +45,18 @@ namespace Cysharp.Threading.Tasks return new <#= t.typeName #>Awaiter(asyncOperation); } - public static <#= ToUniTaskReturnType(t.returnType) #> ToUniTask(this <#= t.typeName #> asyncOperation) + public static <#= ToUniTaskReturnType(t.returnType) #> WithCancellation(this <#= t.typeName #> asyncOperation, CancellationToken cancellationToken) { Error.ThrowArgumentNullException(asyncOperation, nameof(asyncOperation)); - - return new <#= ToUniTaskReturnType(t.returnType) #>(<#= t.typeName #>ConfiguredSource.Create(asyncOperation, PlayerLoopTiming.Update, null, CancellationToken.None, out var token), token); + if (asyncOperation.isDone) return <#= IsVoid(t) ? "UniTask.CompletedTask" : $"UniTask.FromResult(asyncOperation.{t.returnField})" #>; + return new <#= ToUniTaskReturnType(t.returnType) #>(<#= t.typeName #>ConfiguredSource.Create(asyncOperation, PlayerLoopTiming.Update, null, cancellationToken, out var token), token); } - public static <#= ToUniTaskReturnType(t.returnType) #> ConfigureAwait(this <#= t.typeName #> asyncOperation, IProgress progress = null, PlayerLoopTiming timing = PlayerLoopTiming.Update, CancellationToken cancellation = default(CancellationToken)) + public static <#= ToUniTaskReturnType(t.returnType) #> ToUniTask(this <#= t.typeName #> asyncOperation, IProgress progress = null, PlayerLoopTiming timing = PlayerLoopTiming.Update, CancellationToken cancellationToken = default(CancellationToken)) { Error.ThrowArgumentNullException(asyncOperation, nameof(asyncOperation)); - - return new <#= ToUniTaskReturnType(t.returnType) #>(<#= t.typeName #>ConfiguredSource.Create(asyncOperation, timing, progress, cancellation, out var token), token); + if (asyncOperation.isDone) return <#= IsVoid(t) ? "UniTask.CompletedTask" : $"UniTask.FromResult(asyncOperation.{t.returnField})" #>; + return new <#= ToUniTaskReturnType(t.returnType) #>(<#= t.typeName #>ConfiguredSource.Create(asyncOperation, timing, progress, cancellationToken, out var token), token); } public struct <#= t.typeName #>Awaiter : ICriticalNotifyCompletion @@ -106,14 +106,20 @@ namespace Cysharp.Threading.Tasks public void UnsafeOnCompleted(Action continuation) { Error.ThrowWhenContinuationIsAlreadyRegistered(continuationAction); - continuationAction = continuation.AsFuncOfT(); // allocate delegate. + continuationAction = PooledDelegate.Create(continuation); asyncOperation.completed += continuationAction; } } - class <#= t.typeName #>ConfiguredSource : <#= ToIUniTaskSourceReturnType(t.returnType) #>, IPlayerLoopItem, IPromisePoolItem + class <#= t.typeName #>ConfiguredSource : <#= ToIUniTaskSourceReturnType(t.returnType) #>, IPlayerLoopItem, ITaskPoolNode<<#= t.typeName #>ConfiguredSource> { - static readonly PromisePool<<#= t.typeName #>ConfiguredSource> pool = new PromisePool<<#= t.typeName #>ConfiguredSource>(); + static TaskPool<<#= t.typeName #>ConfiguredSource> pool; + public <#= t.typeName #>ConfiguredSource NextNode { get; set; } + + static <#= t.typeName #>ConfiguredSource() + { + TaskPool.RegisterSizeGetter(typeof(<#= t.typeName #>ConfiguredSource), () => pool.Size); + } <#= t.typeName #> asyncOperation; IProgress progress; @@ -133,7 +139,10 @@ namespace Cysharp.Threading.Tasks return AutoResetUniTaskCompletionSource<#= IsVoid(t) ? "" : $"<{t.returnType}>" #>.CreateFromCanceled(cancellationToken, out token); } - var result = pool.TryRent() ?? new <#= t.typeName #>ConfiguredSource(); + if (!pool.TryPop(out var result)) + { + result = new <#= t.typeName #>ConfiguredSource(); + } result.asyncOperation = asyncOperation; result.progress = progress; @@ -151,8 +160,6 @@ namespace Cysharp.Threading.Tasks { try { - TaskTracker.RemoveTracking(this); - <# if (!IsVoid(t)) { #> return core.GetResult(token); <# } else { #> @@ -161,7 +168,7 @@ namespace Cysharp.Threading.Tasks } finally { - pool.TryReturn(this); + TryReturn(); } } @@ -191,6 +198,9 @@ namespace Cysharp.Threading.Tasks { if (cancellationToken.IsCancellationRequested) { +<# if(t.returnType == "UnityWebRequest") { #> + asyncOperation.webRequest.Abort(); +<# } #> core.TrySetCanceled(cancellationToken); return false; } @@ -209,24 +219,26 @@ namespace Cysharp.Threading.Tasks return true; } - public void Reset() + bool TryReturn() { + TaskTracker.RemoveTracking(this); core.Reset(); asyncOperation = default; progress = default; cancellationToken = default; + return pool.TryPush(this); } ~<#= t.typeName #>ConfiguredSource() { - if (pool.TryReturn(this)) + if (TryReturn()) { GC.ReRegisterForFinalize(this); } } } -# endregion + #endregion <# if(t.returnType == "UnityWebRequest") { #> #endif <# } #>