Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ public static (UniTask, CancellationTokenRegistration) ToUniTask(this Cancellati
return (UniTask.FromCanceled(cancellationToken), default(CancellationTokenRegistration));
}

var promise = new UniTaskCompletionSource();
var promise = AutoResetUniTaskCompletionSource.Create();
return (promise.Task, cancellationToken.RegisterWithoutCaptureExecutionContext(cancellationTokenCallback, promise));
}

static void Callback(object state)
{
var promise = (UniTaskCompletionSource)state;
var promise = (AutoResetUniTaskCompletionSource)state;
promise.TrySetResult();
}

Expand Down
4 changes: 2 additions & 2 deletions src/UniTask/Assets/Plugins/UniTask/Runtime/Channel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ internal class SingleConsumerUnboundedChannel<T> : Channel<T>
{
readonly Queue<T> items;
readonly SingleConsumerUnboundedChannelReader readerSource;
UniTaskCompletionSource completedTaskSource;
AutoResetUniTaskCompletionSource completedTaskSource;
UniTask completedTask;

Exception completionError;
Expand Down Expand Up @@ -208,7 +208,7 @@ public override UniTask Completion
return parent.completedTask;
}

parent.completedTaskSource = new UniTaskCompletionSource();
parent.completedTaskSource = AutoResetUniTaskCompletionSource.Create();
return parent.completedTaskSource.Task;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/UniTask/Assets/Plugins/UniTask/Runtime/Linq/Never.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ public _Never(CancellationToken cancellationToken)

public UniTask<bool> MoveNextAsync()
{
var tcs = new UniTaskCompletionSource<bool>();
var tcs = AutoResetUniTaskCompletionSource<bool>.Create();

cancellationToken.Register(state =>
{
var task = (UniTaskCompletionSource<bool>)state;
var task = (AutoResetUniTaskCompletionSource<bool>)state;
task.TrySetCanceled(cancellationToken);
}, tcs);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ public static CancellationToken GetCancellationTokenOnDestroy(this MonoBehaviour

#endif

/// <summary>This CancellationToken is canceled when the MonoBehaviour will be destroyed.</summary>
/// <summary>This CancellationToken is canceled when the GameObject will be destroyed.</summary>
public static CancellationToken GetCancellationTokenOnDestroy(this GameObject gameObject)
{
return gameObject.GetAsyncDestroyTrigger().CancellationToken;
}

/// <summary>This CancellationToken is canceled when the MonoBehaviour will be destroyed.</summary>
/// <summary>This CancellationToken is canceled when the Component will be destroyed.</summary>
public static CancellationToken GetCancellationTokenOnDestroy(this Component component)
{
#if UNITY_2022_2_OR_NEWER
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ public static partial class UniTaskExtensions
/// </summary>
public static UniTask<T> AsUniTask<T>(this Task<T> task, bool useCurrentSynchronizationContext = true)
{
var promise = new UniTaskCompletionSource<T>();
var promise = AutoResetUniTaskCompletionSource<T>.Create();

task.ContinueWith((x, state) =>
{
var p = (UniTaskCompletionSource<T>)state;
var p = (AutoResetUniTaskCompletionSource<T>)state;

switch (x.Status)
{
Expand All @@ -46,11 +46,11 @@ public static UniTask<T> AsUniTask<T>(this Task<T> task, bool useCurrentSynchron
/// </summary>
public static UniTask AsUniTask(this Task task, bool useCurrentSynchronizationContext = true)
{
var promise = new UniTaskCompletionSource();
var promise = AutoResetUniTaskCompletionSource.Create();

task.ContinueWith((x, state) =>
{
var p = (UniTaskCompletionSource)state;
var p = (AutoResetUniTaskCompletionSource)state;

switch (x.Status)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public static class UniTaskObservableExtensions
{
public static UniTask<T> ToUniTask<T>(this IObservable<T> source, bool useFirstValue = false, CancellationToken cancellationToken = default)
{
var promise = new UniTaskCompletionSource<T>();
var promise = AutoResetUniTaskCompletionSource<T>.Create();
var disposable = new SingleAssignmentDisposable();

var observer = useFirstValue
Expand Down Expand Up @@ -109,15 +109,15 @@ class ToUniTaskObserver<T> : IObserver<T>
{
static readonly Action<object> callback = OnCanceled;

readonly UniTaskCompletionSource<T> promise;
readonly IPromise<T> promise;
readonly SingleAssignmentDisposable disposable;
readonly CancellationToken cancellationToken;
readonly CancellationTokenRegistration registration;

bool hasValue;
T latestValue;

public ToUniTaskObserver(UniTaskCompletionSource<T> promise, SingleAssignmentDisposable disposable, CancellationToken cancellationToken)
public ToUniTaskObserver(IPromise<T> promise, SingleAssignmentDisposable disposable, CancellationToken cancellationToken)
{
this.promise = promise;
this.disposable = disposable;
Expand Down Expand Up @@ -180,14 +180,14 @@ class FirstValueToUniTaskObserver<T> : IObserver<T>
{
static readonly Action<object> callback = OnCanceled;

readonly UniTaskCompletionSource<T> promise;
readonly IPromise<T> promise;
readonly SingleAssignmentDisposable disposable;
readonly CancellationToken cancellationToken;
readonly CancellationTokenRegistration registration;

bool hasValue;

public FirstValueToUniTaskObserver(UniTaskCompletionSource<T> promise, SingleAssignmentDisposable disposable, CancellationToken cancellationToken)
public FirstValueToUniTaskObserver(IPromise<T> promise, SingleAssignmentDisposable disposable, CancellationToken cancellationToken)
{
this.promise = promise;
this.disposable = disposable;
Expand Down
Loading