Skip to content
Merged
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 @@ -80,7 +80,7 @@ public Task WriteDataAsync(ReadOnlySpan<byte> buffer, CancellationToken cancella
return Task.FromCanceled(cancellationToken);
}

return WriteAsync(buffer, cancellationToken).AsTask();
return WriteAsync(buffer, cancellationToken).GetAsTask();
}

public ValueTask<FlushResult> WriteDataToPipeAsync(ReadOnlySpan<byte> buffer, CancellationToken cancellationToken = default)
Expand Down
6 changes: 3 additions & 3 deletions src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ private async Task FireOnCompletedAwaited(Task currentTask, Stack<KeyValuePair<F
[MethodImpl(MethodImplOptions.NoInlining)]
private Task FlushAsyncInternal()
{
return Output.FlushAsync(default).AsTask();
return Output.FlushAsync(default).GetAsTask();
}

private void VerifyAndUpdateWrite(int count)
Expand Down Expand Up @@ -1374,7 +1374,7 @@ public ValueTask<FlushResult> WritePipeAsync(ReadOnlyMemory<byte> data, Cancella

public Task FlushAsync(CancellationToken cancellationToken = default)
{
return FlushPipeAsync(cancellationToken).AsTask();
return FlushPipeAsync(cancellationToken).GetAsTask();
}

[MethodImpl(MethodImplOptions.NoInlining)]
Expand All @@ -1386,7 +1386,7 @@ private async ValueTask<FlushResult> FlushAsyncAwaited(Task initializeTask, Canc

public Task WriteAsync(ReadOnlyMemory<byte> data, CancellationToken cancellationToken = default(CancellationToken))
{
return WritePipeAsync(data, cancellationToken).AsTask();
return WritePipeAsync(data, cancellationToken).GetAsTask();
}

public async ValueTask<FlushResult> WriteAsyncAwaited(Task initializeTask, ReadOnlyMemory<byte> data, CancellationToken cancellationToken)
Expand Down
27 changes: 27 additions & 0 deletions src/Servers/Kestrel/Core/src/Internal/Http/ValueTaskExtensions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System.IO.Pipelines;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;

namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
{
internal static class ValueTaskExtensions
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Task GetAsTask(this in ValueTask<FlushResult> valueTask)
{
if (valueTask.IsCompletedSuccessfully)
{
// Signal consumption to the IValueTaskSource
valueTask.GetAwaiter().GetResult();
return Task.CompletedTask;
}
else
{
return valueTask.AsTask();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public Task WriteDataAsync(ReadOnlySpan<byte> data, CancellationToken cancellati
_startedWritingDataFrames = true;

_dataPipe.Writer.Write(data);
return _flusher.FlushAsync(this, cancellationToken).AsTask();
return _flusher.FlushAsync(this, cancellationToken).GetAsTask();
}
}

Expand Down