Add TaskTracker to AsyncLINQ
parent
997b0b3710
commit
f99910d802
|
@ -65,6 +65,8 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.element = element;
|
this.element = element;
|
||||||
this.state = append ? State.RequireAppend : State.RequirePrepend;
|
this.state = append ? State.RequireAppend : State.RequirePrepend;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TSource Current { get; private set; }
|
public TSource Current { get; private set; }
|
||||||
|
@ -136,6 +138,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (enumerator != null)
|
if (enumerator != null)
|
||||||
{
|
{
|
||||||
return enumerator.DisposeAsync();
|
return enumerator.DisposeAsync();
|
||||||
|
|
|
@ -76,6 +76,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
{
|
{
|
||||||
this.source = source;
|
this.source = source;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
// abstract
|
// abstract
|
||||||
|
@ -178,6 +179,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
// if require additional resource to dispose, override and call base.DisposeAsync.
|
// if require additional resource to dispose, override and call base.DisposeAsync.
|
||||||
public virtual UniTask DisposeAsync()
|
public virtual UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (enumerator != null)
|
if (enumerator != null)
|
||||||
{
|
{
|
||||||
return enumerator.DisposeAsync();
|
return enumerator.DisposeAsync();
|
||||||
|
@ -204,6 +206,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
{
|
{
|
||||||
this.source = source;
|
this.source = source;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
// abstract
|
// abstract
|
||||||
|
@ -399,6 +402,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
// if require additional resource to dispose, override and call base.DisposeAsync.
|
// if require additional resource to dispose, override and call base.DisposeAsync.
|
||||||
public virtual UniTask DisposeAsync()
|
public virtual UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (enumerator != null)
|
if (enumerator != null)
|
||||||
{
|
{
|
||||||
return enumerator.DisposeAsync();
|
return enumerator.DisposeAsync();
|
||||||
|
|
|
@ -61,6 +61,8 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.source = source;
|
this.source = source;
|
||||||
this.count = count;
|
this.count = count;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public IList<TSource> Current { get; private set; }
|
public IList<TSource> Current { get; private set; }
|
||||||
|
@ -167,6 +169,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (enumerator != null)
|
if (enumerator != null)
|
||||||
{
|
{
|
||||||
return enumerator.DisposeAsync();
|
return enumerator.DisposeAsync();
|
||||||
|
@ -217,6 +220,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.count = count;
|
this.count = count;
|
||||||
this.skip = skip;
|
this.skip = skip;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public IList<TSource> Current { get; private set; }
|
public IList<TSource> Current { get; private set; }
|
||||||
|
@ -329,6 +333,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (enumerator != null)
|
if (enumerator != null)
|
||||||
{
|
{
|
||||||
return enumerator.DisposeAsync();
|
return enumerator.DisposeAsync();
|
||||||
|
|
|
@ -57,6 +57,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.second = second;
|
this.second = second;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
this.iteratingState = IteratingState.IteratingFirst;
|
this.iteratingState = IteratingState.IteratingFirst;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TSource Current { get; private set; }
|
public TSource Current { get; private set; }
|
||||||
|
@ -150,6 +151,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (enumerator != null)
|
if (enumerator != null)
|
||||||
{
|
{
|
||||||
return enumerator.DisposeAsync();
|
return enumerator.DisposeAsync();
|
||||||
|
|
|
@ -63,6 +63,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
|
||||||
this.iteratingState = IteratingState.Empty;
|
this.iteratingState = IteratingState.Empty;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TSource Current { get; private set; }
|
public TSource Current { get; private set; }
|
||||||
|
@ -128,6 +129,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (enumerator != null)
|
if (enumerator != null)
|
||||||
{
|
{
|
||||||
return enumerator.DisposeAsync();
|
return enumerator.DisposeAsync();
|
||||||
|
|
|
@ -124,6 +124,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.onError = onError;
|
this.onError = onError;
|
||||||
this.onCompleted = onCompleted;
|
this.onCompleted = onCompleted;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TSource Current { get; private set; }
|
public TSource Current { get; private set; }
|
||||||
|
@ -244,6 +245,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (enumerator != null)
|
if (enumerator != null)
|
||||||
{
|
{
|
||||||
return enumerator.DisposeAsync();
|
return enumerator.DisposeAsync();
|
||||||
|
|
|
@ -255,6 +255,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.elementSelector = elementSelector;
|
this.elementSelector = elementSelector;
|
||||||
this.comparer = comparer;
|
this.comparer = comparer;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public IGrouping<TKey, TElement> Current { get; private set; }
|
public IGrouping<TKey, TElement> Current { get; private set; }
|
||||||
|
@ -313,6 +314,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (groupEnumerator != null)
|
if (groupEnumerator != null)
|
||||||
{
|
{
|
||||||
groupEnumerator.Dispose();
|
groupEnumerator.Dispose();
|
||||||
|
@ -364,6 +366,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.resultSelector = resultSelector;
|
this.resultSelector = resultSelector;
|
||||||
this.comparer = comparer;
|
this.comparer = comparer;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TResult Current { get; private set; }
|
public TResult Current { get; private set; }
|
||||||
|
@ -423,6 +426,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (groupEnumerator != null)
|
if (groupEnumerator != null)
|
||||||
{
|
{
|
||||||
groupEnumerator.Dispose();
|
groupEnumerator.Dispose();
|
||||||
|
@ -470,6 +474,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.elementSelector = elementSelector;
|
this.elementSelector = elementSelector;
|
||||||
this.comparer = comparer;
|
this.comparer = comparer;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public IGrouping<TKey, TElement> Current { get; private set; }
|
public IGrouping<TKey, TElement> Current { get; private set; }
|
||||||
|
@ -528,6 +533,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (groupEnumerator != null)
|
if (groupEnumerator != null)
|
||||||
{
|
{
|
||||||
groupEnumerator.Dispose();
|
groupEnumerator.Dispose();
|
||||||
|
@ -582,6 +588,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.resultSelector = resultSelector;
|
this.resultSelector = resultSelector;
|
||||||
this.comparer = comparer;
|
this.comparer = comparer;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TResult Current { get; private set; }
|
public TResult Current { get; private set; }
|
||||||
|
@ -661,6 +668,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (groupEnumerator != null)
|
if (groupEnumerator != null)
|
||||||
{
|
{
|
||||||
groupEnumerator.Dispose();
|
groupEnumerator.Dispose();
|
||||||
|
@ -708,6 +716,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.elementSelector = elementSelector;
|
this.elementSelector = elementSelector;
|
||||||
this.comparer = comparer;
|
this.comparer = comparer;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public IGrouping<TKey, TElement> Current { get; private set; }
|
public IGrouping<TKey, TElement> Current { get; private set; }
|
||||||
|
@ -766,6 +775,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (groupEnumerator != null)
|
if (groupEnumerator != null)
|
||||||
{
|
{
|
||||||
groupEnumerator.Dispose();
|
groupEnumerator.Dispose();
|
||||||
|
@ -820,6 +830,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.resultSelector = resultSelector;
|
this.resultSelector = resultSelector;
|
||||||
this.comparer = comparer;
|
this.comparer = comparer;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TResult Current { get; private set; }
|
public TResult Current { get; private set; }
|
||||||
|
@ -899,6 +910,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (groupEnumerator != null)
|
if (groupEnumerator != null)
|
||||||
{
|
{
|
||||||
groupEnumerator.Dispose();
|
groupEnumerator.Dispose();
|
||||||
|
|
|
@ -129,6 +129,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.resultSelector = resultSelector;
|
this.resultSelector = resultSelector;
|
||||||
this.comparer = comparer;
|
this.comparer = comparer;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TResult Current { get; private set; }
|
public TResult Current { get; private set; }
|
||||||
|
@ -208,6 +209,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (enumerator != null)
|
if (enumerator != null)
|
||||||
{
|
{
|
||||||
return enumerator.DisposeAsync();
|
return enumerator.DisposeAsync();
|
||||||
|
@ -273,6 +275,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.resultSelector = resultSelector;
|
this.resultSelector = resultSelector;
|
||||||
this.comparer = comparer;
|
this.comparer = comparer;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TResult Current { get; private set; }
|
public TResult Current { get; private set; }
|
||||||
|
@ -401,6 +404,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (enumerator != null)
|
if (enumerator != null)
|
||||||
{
|
{
|
||||||
return enumerator.DisposeAsync();
|
return enumerator.DisposeAsync();
|
||||||
|
@ -466,6 +470,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.resultSelector = resultSelector;
|
this.resultSelector = resultSelector;
|
||||||
this.comparer = comparer;
|
this.comparer = comparer;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TResult Current { get; private set; }
|
public TResult Current { get; private set; }
|
||||||
|
@ -594,6 +599,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (enumerator != null)
|
if (enumerator != null)
|
||||||
{
|
{
|
||||||
return enumerator.DisposeAsync();
|
return enumerator.DisposeAsync();
|
||||||
|
|
|
@ -131,6 +131,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.resultSelector = resultSelector;
|
this.resultSelector = resultSelector;
|
||||||
this.comparer = comparer;
|
this.comparer = comparer;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TResult Current { get; private set; }
|
public TResult Current { get; private set; }
|
||||||
|
@ -248,6 +249,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (valueEnumerator != null)
|
if (valueEnumerator != null)
|
||||||
{
|
{
|
||||||
valueEnumerator.Dispose();
|
valueEnumerator.Dispose();
|
||||||
|
@ -321,6 +323,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.resultSelector = resultSelector;
|
this.resultSelector = resultSelector;
|
||||||
this.comparer = comparer;
|
this.comparer = comparer;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TResult Current { get; private set; }
|
public TResult Current { get; private set; }
|
||||||
|
@ -476,6 +479,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (valueEnumerator != null)
|
if (valueEnumerator != null)
|
||||||
{
|
{
|
||||||
valueEnumerator.Dispose();
|
valueEnumerator.Dispose();
|
||||||
|
@ -549,6 +553,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.resultSelector = resultSelector;
|
this.resultSelector = resultSelector;
|
||||||
this.comparer = comparer;
|
this.comparer = comparer;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TResult Current { get; private set; }
|
public TResult Current { get; private set; }
|
||||||
|
@ -704,6 +709,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (valueEnumerator != null)
|
if (valueEnumerator != null)
|
||||||
{
|
{
|
||||||
valueEnumerator.Dispose();
|
valueEnumerator.Dispose();
|
||||||
|
|
|
@ -422,6 +422,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
{
|
{
|
||||||
this.parent = parent;
|
this.parent = parent;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TElement Current { get; private set; }
|
public TElement Current { get; private set; }
|
||||||
|
@ -477,6 +478,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
return default;
|
return default;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,6 +33,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
Channel<TSource> channel;
|
Channel<TSource> channel;
|
||||||
IUniTaskAsyncEnumerator<TSource> channelEnumerator;
|
IUniTaskAsyncEnumerator<TSource> channelEnumerator;
|
||||||
IUniTaskAsyncEnumerator<TSource> sourceEnumerator;
|
IUniTaskAsyncEnumerator<TSource> sourceEnumerator;
|
||||||
|
bool channelClosed;
|
||||||
|
|
||||||
public _Queue(IUniTaskAsyncEnumerable<TSource> source, CancellationToken cancellationToken)
|
public _Queue(IUniTaskAsyncEnumerable<TSource> source, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
|
@ -53,13 +54,13 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
channelEnumerator = channel.Reader.ReadAllAsync().GetAsyncEnumerator(cancellationToken);
|
channelEnumerator = channel.Reader.ReadAllAsync().GetAsyncEnumerator(cancellationToken);
|
||||||
|
|
||||||
ConsumeAll(sourceEnumerator, channel).Forget();
|
ConsumeAll(this, sourceEnumerator, channel).Forget();
|
||||||
}
|
}
|
||||||
|
|
||||||
return channelEnumerator.MoveNextAsync();
|
return channelEnumerator.MoveNextAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
static async UniTaskVoid ConsumeAll(IUniTaskAsyncEnumerator<TSource> enumerator, ChannelWriter<TSource> writer)
|
static async UniTaskVoid ConsumeAll(_Queue self, IUniTaskAsyncEnumerator<TSource> enumerator, ChannelWriter<TSource> writer)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -75,6 +76,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
|
self.channelClosed = true;
|
||||||
await enumerator.DisposeAsync();
|
await enumerator.DisposeAsync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -89,6 +91,12 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
{
|
{
|
||||||
await channelEnumerator.DisposeAsync();
|
await channelEnumerator.DisposeAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!channelClosed)
|
||||||
|
{
|
||||||
|
channelClosed = true;
|
||||||
|
channel.Writer.TryComplete(new OperationCanceledException());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,6 +40,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
{
|
{
|
||||||
this.source = source;
|
this.source = source;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TSource Current { get; private set; }
|
public TSource Current { get; private set; }
|
||||||
|
@ -69,6 +70,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
return default;
|
return default;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -160,6 +160,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.selector2 = selector2;
|
this.selector2 = selector2;
|
||||||
this.resultSelector = resultSelector;
|
this.resultSelector = resultSelector;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TResult Current { get; private set; }
|
public TResult Current { get; private set; }
|
||||||
|
@ -324,6 +325,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public async UniTask DisposeAsync()
|
public async UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (selectedEnumerator != null)
|
if (selectedEnumerator != null)
|
||||||
{
|
{
|
||||||
await selectedEnumerator.DisposeAsync();
|
await selectedEnumerator.DisposeAsync();
|
||||||
|
@ -398,6 +400,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.selector2 = selector2;
|
this.selector2 = selector2;
|
||||||
this.resultSelector = resultSelector;
|
this.resultSelector = resultSelector;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TResult Current { get; private set; }
|
public TResult Current { get; private set; }
|
||||||
|
@ -598,6 +601,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public async UniTask DisposeAsync()
|
public async UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (selectedEnumerator != null)
|
if (selectedEnumerator != null)
|
||||||
{
|
{
|
||||||
await selectedEnumerator.DisposeAsync();
|
await selectedEnumerator.DisposeAsync();
|
||||||
|
@ -672,6 +676,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.selector2 = selector2;
|
this.selector2 = selector2;
|
||||||
this.resultSelector = resultSelector;
|
this.resultSelector = resultSelector;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TResult Current { get; private set; }
|
public TResult Current { get; private set; }
|
||||||
|
@ -872,6 +877,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public async UniTask DisposeAsync()
|
public async UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (selectedEnumerator != null)
|
if (selectedEnumerator != null)
|
||||||
{
|
{
|
||||||
await selectedEnumerator.DisposeAsync();
|
await selectedEnumerator.DisposeAsync();
|
||||||
|
|
|
@ -56,6 +56,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.source = source;
|
this.source = source;
|
||||||
this.count = count;
|
this.count = count;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TSource Current { get; private set; }
|
public TSource Current { get; private set; }
|
||||||
|
@ -146,6 +147,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (enumerator != null)
|
if (enumerator != null)
|
||||||
{
|
{
|
||||||
return enumerator.DisposeAsync();
|
return enumerator.DisposeAsync();
|
||||||
|
|
|
@ -48,6 +48,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.source = source;
|
this.source = source;
|
||||||
this.cancellationToken1 = cancellationToken1;
|
this.cancellationToken1 = cancellationToken1;
|
||||||
this.cancellationToken2 = cancellationToken2;
|
this.cancellationToken2 = cancellationToken2;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TSource Current { get; private set; }
|
public TSource Current { get; private set; }
|
||||||
|
@ -131,6 +132,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (enumerator != null)
|
if (enumerator != null)
|
||||||
{
|
{
|
||||||
return enumerator.DisposeAsync();
|
return enumerator.DisposeAsync();
|
||||||
|
|
|
@ -47,6 +47,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.source = source;
|
this.source = source;
|
||||||
this.count = count;
|
this.count = count;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TSource Current { get; private set; }
|
public TSource Current { get; private set; }
|
||||||
|
@ -111,6 +112,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (enumerator != null)
|
if (enumerator != null)
|
||||||
{
|
{
|
||||||
return enumerator.DisposeAsync();
|
return enumerator.DisposeAsync();
|
||||||
|
|
|
@ -57,6 +57,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.source = source;
|
this.source = source;
|
||||||
this.count = count;
|
this.count = count;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TSource Current { get; private set; }
|
public TSource Current { get; private set; }
|
||||||
|
@ -162,6 +163,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (enumerator != null)
|
if (enumerator != null)
|
||||||
{
|
{
|
||||||
return enumerator.DisposeAsync();
|
return enumerator.DisposeAsync();
|
||||||
|
|
|
@ -61,6 +61,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
{
|
{
|
||||||
this.cancellationTokenRegistration2 = cancellationToken2.RegisterWithoutCaptureExecutionContext(CancelDelegate2, this);
|
this.cancellationTokenRegistration2 = cancellationToken2.RegisterWithoutCaptureExecutionContext(CancelDelegate2, this);
|
||||||
}
|
}
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TSource Current { get; private set; }
|
public TSource Current { get; private set; }
|
||||||
|
@ -149,6 +150,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public UniTask DisposeAsync()
|
public UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
cancellationTokenRegistration1.Dispose();
|
cancellationTokenRegistration1.Dispose();
|
||||||
cancellationTokenRegistration2.Dispose();
|
cancellationTokenRegistration2.Dispose();
|
||||||
if (enumerator != null)
|
if (enumerator != null)
|
||||||
|
|
|
@ -84,6 +84,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.second = second;
|
this.second = second;
|
||||||
this.resultSelector = resultSelector;
|
this.resultSelector = resultSelector;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TResult Current { get; private set; }
|
public TResult Current { get; private set; }
|
||||||
|
@ -181,6 +182,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public async UniTask DisposeAsync()
|
public async UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (firstEnumerator != null)
|
if (firstEnumerator != null)
|
||||||
{
|
{
|
||||||
await firstEnumerator.DisposeAsync();
|
await firstEnumerator.DisposeAsync();
|
||||||
|
@ -236,6 +238,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.second = second;
|
this.second = second;
|
||||||
this.resultSelector = resultSelector;
|
this.resultSelector = resultSelector;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TResult Current { get; private set; }
|
public TResult Current { get; private set; }
|
||||||
|
@ -351,6 +354,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public async UniTask DisposeAsync()
|
public async UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (firstEnumerator != null)
|
if (firstEnumerator != null)
|
||||||
{
|
{
|
||||||
await firstEnumerator.DisposeAsync();
|
await firstEnumerator.DisposeAsync();
|
||||||
|
@ -406,6 +410,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
this.second = second;
|
this.second = second;
|
||||||
this.resultSelector = resultSelector;
|
this.resultSelector = resultSelector;
|
||||||
this.cancellationToken = cancellationToken;
|
this.cancellationToken = cancellationToken;
|
||||||
|
TaskTracker.TrackActiveTask(this, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TResult Current { get; private set; }
|
public TResult Current { get; private set; }
|
||||||
|
@ -521,6 +526,7 @@ namespace Cysharp.Threading.Tasks.Linq
|
||||||
|
|
||||||
public async UniTask DisposeAsync()
|
public async UniTask DisposeAsync()
|
||||||
{
|
{
|
||||||
|
TaskTracker.RemoveTracking(this);
|
||||||
if (firstEnumerator != null)
|
if (firstEnumerator != null)
|
||||||
{
|
{
|
||||||
await firstEnumerator.DisposeAsync();
|
await firstEnumerator.DisposeAsync();
|
||||||
|
|
|
@ -190,7 +190,7 @@ public class SandboxMain : MonoBehaviour
|
||||||
Debug.Log("Done");
|
Debug.Log("Done");
|
||||||
}
|
}
|
||||||
|
|
||||||
async UniTaskVoid Start()
|
void Start()
|
||||||
{
|
{
|
||||||
//var rp = new AsyncReactiveProperty<int>(10);
|
//var rp = new AsyncReactiveProperty<int>(10);
|
||||||
|
|
||||||
|
@ -200,11 +200,15 @@ public class SandboxMain : MonoBehaviour
|
||||||
|
|
||||||
//rp.Dispose();
|
//rp.Dispose();
|
||||||
|
|
||||||
var channel = Channel.CreateSingleConsumerUnbounded<int>();
|
//var channel = Channel.CreateSingleConsumerUnbounded<int>();
|
||||||
Debug.Log("wait channel");
|
//Debug.Log("wait channel");
|
||||||
await channel.Reader.ReadAllAsync(this.GetCancellationTokenOnDestroy()).ForEachAsync(_ => { });
|
//await channel.Reader.ReadAllAsync(this.GetCancellationTokenOnDestroy()).ForEachAsync(_ => { });
|
||||||
|
|
||||||
|
|
||||||
|
var rp = new AsyncReactiveProperty<int>(10);
|
||||||
|
|
||||||
|
rp.Append(10).Select(x => x * 100).Take(30).Prepend(99).SkipLast(9).Where(x => x % 2 == 0).ForEachAsync(_ => { }).Forget();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async UniTaskVoid Running(CancellationToken ct)
|
async UniTaskVoid Running(CancellationToken ct)
|
||||||
|
|
Loading…
Reference in New Issue