Skip to content

[release/6.0-rc1] Fixed StreamPipeReader.CopyToAsync #57966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danmoseley merged 2 commits into from
Aug 24, 2021
Merged

[release/6.0-rc1] Fixed StreamPipeReader.CopyToAsync #57966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b234dca
Fixed StreamPipeReader.CopyToAsync - Take the segment index into acco…
davidfowl Aug 23, 2021
4d7f01c
Always slice
davidfowl Aug 23, 2021
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
10 changes: 8 additions & 2 deletions src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/StreamPipeReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,18 +383,21 @@ public override async Task CopyToAsync(PipeWriter destination, CancellationToken
try
{
BufferSegment? segment = _readHead;
int segmentIndex = _readIndex;

try
{
while (segment != null)
{
FlushResult flushResult = await destination.WriteAsync(segment.Memory, tokenSource.Token).ConfigureAwait(false);
FlushResult flushResult = await destination.WriteAsync(segment.Memory.Slice(segmentIndex), tokenSource.Token).ConfigureAwait(false);

if (flushResult.IsCanceled)
{
ThrowHelper.ThrowOperationCanceledException_FlushCanceled();
}

segment = segment.NextSegment;
segmentIndex = 0;

if (flushResult.IsCompleted)
{
Expand Down Expand Up @@ -451,13 +454,16 @@ public override async Task CopyToAsync(Stream destination, CancellationToken can
try
{
BufferSegment? segment = _readHead;
int segmentIndex = _readIndex;

try
{
while (segment != null)
{
await destination.WriteAsync(segment.Memory, tokenSource.Token).ConfigureAwait(false);
await destination.WriteAsync(segment.Memory.Slice(segmentIndex), tokenSource.Token).ConfigureAwait(false);

segment = segment.NextSegment;
segmentIndex = 0;
}
}
finally
Expand Down
36 changes: 36 additions & 0 deletions src/libraries/System.IO.Pipelines/tests/PipeReaderCopyToAsyncTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,5 +286,41 @@ public async Task ThrowingFromStreamCallsAdvanceToWithStartOfLastReadResult(int
Assert.True(startPosition.Equals(wrappedPipeReader.LastConsumed));
Assert.True(startPosition.Equals(wrappedPipeReader.LastExamined));
}

[Fact]
public async Task CopyToAsyncStreamCopiesRemainderAfterReadingSome()
{
var buffer = Encoding.UTF8.GetBytes("Hello World");
await Pipe.Writer.WriteAsync(buffer);
Pipe.Writer.Complete();

var result = await PipeReader.ReadAsync();
Assert.Equal(result.Buffer.ToArray(), buffer);
// Consume Hello
PipeReader.AdvanceTo(result.Buffer.GetPosition(5));

var ms = new MemoryStream();
await PipeReader.CopyToAsync(ms);

Assert.Equal(buffer.AsMemory(5).ToArray(), ms.ToArray());
}

[Fact]
public async Task CopyToAsyncPipeWriterCopiesRemainderAfterReadingSome()
{
var buffer = Encoding.UTF8.GetBytes("Hello World");
await Pipe.Writer.WriteAsync(buffer);
Pipe.Writer.Complete();

var result = await PipeReader.ReadAsync();
Assert.Equal(result.Buffer.ToArray(), buffer);
// Consume Hello
PipeReader.AdvanceTo(result.Buffer.GetPosition(5));

var ms = new MemoryStream();
await PipeReader.CopyToAsync(PipeWriter.Create(ms));

Assert.Equal(buffer.AsMemory(5).ToArray(), ms.ToArray());
}
}
}