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 @@ -354,6 +354,11 @@ public override async Task CopyToAsync(PipeWriter destination, CancellationToken
{
AdvanceTo(segment, segment.End, segment, segment.End);
}
else if (_readTail != null)
{
// All buffered segments were successfully written - advance past them
AdvanceTo(_readTail, _readTail.End, _readTail, _readTail.End);
}
}

await InnerStream.CopyToAsync(destination, tokenSource.Token).ConfigureAwait(false);
Expand Down Expand Up @@ -410,6 +415,11 @@ public override async Task CopyToAsync(Stream destination, CancellationToken can
{
AdvanceTo(segment, segment.End, segment, segment.End);
}
else if (_readTail != null)
{
// All buffered segments were successfully written - advance past them
AdvanceTo(_readTail, _readTail.End, _readTail, _readTail.End);
}
}

await InnerStream.CopyToAsync(destination, tokenSource.Token).ConfigureAwait(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,60 @@ public async Task CopyToAsyncStreamDoesNotDoZeroLengthWrite()
Assert.False(ms.ZeroLengthWriteDetected);
}

[Fact]
public async Task CopyToAsyncPipeWriterAdvancesBufferedData()
{
byte[] buffer = "Hello World"u8.ToArray();
await Pipe.Writer.WriteAsync(buffer);
Pipe.Writer.Complete();

// Buffer some data via ReadAsync
ReadResult readResult = await PipeReader.ReadAsync();
PipeReader.AdvanceTo(readResult.Buffer.Start, readResult.Buffer.End);

// CopyToAsync should advance past the buffered data
var pipe = new Pipe();
await PipeReader.CopyToAsync(pipe.Writer);
await pipe.Writer.CompleteAsync();

ReadResult pipeResult = await pipe.Reader.ReadAsync();
Assert.Equal(buffer.Length, pipeResult.Buffer.Length);
Assert.Equal("Hello World", Encoding.ASCII.GetString(pipeResult.Buffer.ToArray()));
pipe.Reader.AdvanceTo(pipeResult.Buffer.End);
pipe.Reader.Complete();

// Verify the reader state is clean - no buffered data should remain
readResult = await PipeReader.ReadAsync();
Assert.True(readResult.IsCompleted);
Assert.Equal(0, readResult.Buffer.Length);
PipeReader.AdvanceTo(readResult.Buffer.End);
}

[Fact]
public async Task CopyToAsyncStreamAdvancesBufferedData()
{
byte[] buffer = "Hello World"u8.ToArray();
await Pipe.Writer.WriteAsync(buffer);
Pipe.Writer.Complete();

// Buffer some data via ReadAsync
ReadResult readResult = await PipeReader.ReadAsync();
PipeReader.AdvanceTo(readResult.Buffer.Start, readResult.Buffer.End);

// CopyToAsync should advance past the buffered data
var destination = new MemoryStream();
await PipeReader.CopyToAsync(destination);

Assert.Equal(buffer.Length, destination.Length);
Assert.Equal("Hello World", Encoding.ASCII.GetString(destination.ToArray()));

// Verify the reader state is clean - no buffered data should remain
readResult = await PipeReader.ReadAsync();
Assert.True(readResult.IsCompleted);
Assert.Equal(0, readResult.Buffer.Length);
PipeReader.AdvanceTo(readResult.Buffer.End);
}

class LengthCheckStream : MemoryStream
{
public bool ZeroLengthWriteDetected { get; private set; }
Expand Down
Loading