-
Notifications
You must be signed in to change notification settings - Fork 10.4k
Added Write/WriteLine ReadOnlySpan<char> override to HttpResponseStreamWriter #18445
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.
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
Closed
alefranz
wants to merge
5
commits into
dotnet:master
from
alefranz:HttpResponseStreamWriter-span-memory
Closed
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
517be5c
Added Write ReadOnlySpan of char override to HttpResponseStreamWriter
alefranz a61a7e7
Refactored Write ReadOnlySpan of char override to HttpResponseStreamW…
alefranz 8f5450d
Added WriteLine ReadOnlySpan of char override to HttpResponseStreamWr…
alefranz d17c700
Updated reference assembly
alefranz c40f137
Added missing test for disposed
alefranz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -127,6 +127,30 @@ public override void Write(char[] values, int index, int count) | |
} | ||
} | ||
|
||
public override void Write(ReadOnlySpan<char> values) | ||
{ | ||
if (_disposed) | ||
{ | ||
throw new ObjectDisposedException(nameof(HttpResponseStreamWriter)); | ||
} | ||
|
||
int written = 0; | ||
while (written < values.Length) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
{ | ||
if (_charBufferCount == _charBufferSize) | ||
{ | ||
FlushInternal(flushEncoder: false); | ||
} | ||
|
||
written = CopyToCharBuffer(values); | ||
|
||
if (written < values.Length) | ||
{ | ||
values = values.Slice(written); | ||
} | ||
}; | ||
} | ||
|
||
public override void Write(string value) | ||
{ | ||
if (_disposed) | ||
|
@@ -152,6 +176,17 @@ public override void Write(string value) | |
} | ||
} | ||
|
||
public override void WriteLine(ReadOnlySpan<char> values) | ||
{ | ||
if (_disposed) | ||
{ | ||
throw new ObjectDisposedException(nameof(HttpResponseStreamWriter)); | ||
} | ||
|
||
Write(values); | ||
Write(NewLine); | ||
} | ||
|
||
public override Task WriteAsync(char value) | ||
{ | ||
if (_disposed) | ||
|
@@ -423,6 +458,19 @@ private void CopyToCharBuffer(char[] values, ref int index, ref int count) | |
count -= remaining; | ||
} | ||
|
||
private int CopyToCharBuffer(ReadOnlySpan<char> values) | ||
{ | ||
var remaining = Math.Min(_charBufferSize - _charBufferCount, values.Length); | ||
|
||
var source = values.Slice(0, remaining); | ||
var destination = new Span<char>(_charBuffer, _charBufferCount, remaining); | ||
source.CopyTo(destination); | ||
|
||
_charBufferCount += remaining; | ||
|
||
return remaining; | ||
} | ||
|
||
[MethodImpl(MethodImplOptions.NoInlining)] | ||
private static Task GetObjectDisposedTask() | ||
{ | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we add a parallel method for WriteAsync that accepts a ReadOnlyMemory?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have #18451 for those, but it is based on this one, so I will mark it ready for review once this is merged. Unless you prefer to combine it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, I see now!