Lazy async statemachine in WriteToAsync

This commit is contained in:
Ben Adams
2017-08-28 05:29:15 +01:00
parent 98366a4b88
commit 56262bc917
2 changed files with 137 additions and 10 deletions
+94 -6
View File
@@ -275,32 +275,120 @@ namespace Newtonsoft.Json
}
}
internal async Task InternalWriteEndAsync(JsonContainerType type, CancellationToken cancellationToken)
internal Task InternalWriteEndAsync(JsonContainerType type, CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
int levelsToComplete = CalculateLevelsToComplete(type);
if (cancellationToken.IsCancellationRequested)
{
return cancellationToken.FromCanceled();
}
int levelsToComplete = CalculateLevelsToComplete(type);
Task t;
while (levelsToComplete-- > 0)
{
JsonToken token = GetCloseTokenForType(Pop());
if (_currentState == State.Property)
{
await WriteNullAsync(cancellationToken).ConfigureAwait(false);
t = WriteNullAsync(cancellationToken);
if (t.Status != TaskStatus.RanToCompletion)
{
return AwaitProperty(t, levelsToComplete, token, type, cancellationToken);
}
}
if (_formatting == Formatting.Indented)
{
if (_currentState != State.ObjectStart && _currentState != State.ArrayStart)
{
await WriteIndentAsync(cancellationToken).ConfigureAwait(false);
t = WriteIndentAsync(cancellationToken);
if (t.Status != TaskStatus.RanToCompletion)
{
return AwaitIndent(t, levelsToComplete, token, type, cancellationToken);
}
}
}
await WriteEndAsync(token, cancellationToken).ConfigureAwait(false);
t = WriteEndAsync(token, cancellationToken);
if (t.Status != TaskStatus.RanToCompletion)
{
return AwaitEnd(t, levelsToComplete, type, cancellationToken);
}
UpdateCurrentState();
}
return AsyncUtils.CompletedTask;
// Local functions, params renamed (capitalized) so as not to capture and allocate when calling async
async Task AwaitProperty(Task task, int LevelsToComplete, JsonToken token, JsonContainerType Type, CancellationToken CancellationToken)
{
await task;
// Finish current loop
if (_formatting == Formatting.Indented)
{
if (_currentState != State.ObjectStart && _currentState != State.ArrayStart)
{
await WriteIndentAsync(CancellationToken).ConfigureAwait(false);
}
}
await WriteEndAsync(token, CancellationToken).ConfigureAwait(false);
UpdateCurrentState();
await AwaitRemaining(LevelsToComplete, Type, CancellationToken).ConfigureAwait(false);
}
async Task AwaitIndent(Task task, int LevelsToComplete, JsonToken token, JsonContainerType Type, CancellationToken CancellationToken)
{
await task;
// Finish current loop
await WriteEndAsync(token, CancellationToken).ConfigureAwait(false);
UpdateCurrentState();
await AwaitRemaining(LevelsToComplete, Type, CancellationToken).ConfigureAwait(false);
}
async Task AwaitEnd(Task task, int LevelsToComplete, JsonContainerType Type, CancellationToken CancellationToken)
{
await task;
// Finish current loop
UpdateCurrentState();
await AwaitRemaining(LevelsToComplete, Type, CancellationToken).ConfigureAwait(false);
}
async Task AwaitRemaining(int LevelsToComplete, JsonContainerType Type, CancellationToken CancellationToken)
{
while (LevelsToComplete-- > 0)
{
JsonToken token = GetCloseTokenForType(Pop());
if (_currentState == State.Property)
{
await WriteNullAsync(CancellationToken).ConfigureAwait(false);
}
if (_formatting == Formatting.Indented)
{
if (_currentState != State.ObjectStart && _currentState != State.ArrayStart)
{
await WriteIndentAsync(CancellationToken).ConfigureAwait(false);
}
}
await WriteEndAsync(token, CancellationToken).ConfigureAwait(false);
UpdateCurrentState();
}
}
}
/// <summary>