Skip to content
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

S.IO.StringReader: Use ReadOnlySpan.IndexOfAny in ReadLine() for performance #60463

Merged
merged 16 commits into from
Dec 8, 2021
Merged

S.IO.StringReader: Use ReadOnlySpan.IndexOfAny in ReadLine() for performance #60463

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
05214aa
S.IO.StringReader: Use ReadOnlySpan.IndexOfAny in ReadLine() for perf…
nietras Oct 15, 2021
e160a7c
Use throwhelper, add found line length 0 special case
nietras Oct 17, 2021
5e915c5
replace Substring with new string(ReadOnlySpan<char>...)
nietras Oct 17, 2021
c75a139
remove _length, use local s, drop unsafe use
nietras Oct 18, 2021
4f78e7e
address stephentoub feedback
nietras Nov 21, 2021
01dd19e
change Read() similar to Peek()
nietras Nov 21, 2021
e596b6a
more nits
nietras Nov 28, 2021
8bd7254
remove empty line
nietras Nov 28, 2021
9cf69bf
revert back to Substring
nietras Dec 5, 2021
5fcc964
Apply suggestions from code review
adamsitnik Dec 7, 2021
55aa906
(uint)length
nietras Dec 7, 2021
8b4eadf
(uint)length
nietras Dec 7, 2021
2851658
braces
nietras Dec 7, 2021
01dcca8
empty line
nietras Dec 7, 2021
d1551f3
(uint)length
nietras Dec 7, 2021
2b85f51
address s local nits
nietras Dec 7, 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
49 changes: 24 additions & 25 deletions src/libraries/System.Private.CoreLib/src/System/IO/StringReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System.Threading;
using System.Threading.Tasks;
using Internal.Runtime.CompilerServices;

namespace System.IO
{
Expand Down Expand Up @@ -46,7 +47,7 @@ public override int Peek()
{
if (_s == null)
{
throw new ObjectDisposedException(null, SR.ObjectDisposed_ReaderClosed);
ThrowHelper.ThrowObjectDisposedException_ReaderClosed();
}
if (_pos == _length)
{
Expand All @@ -63,7 +64,7 @@ public override int Read()
{
if (_s == null)
{
throw new ObjectDisposedException(null, SR.ObjectDisposed_ReaderClosed);
ThrowHelper.ThrowObjectDisposedException_ReaderClosed();
}
if (_pos == _length)
{
Expand Down Expand Up @@ -98,7 +99,7 @@ public override int Read(char[] buffer, int index, int count)
}
if (_s == null)
{
throw new ObjectDisposedException(null, SR.ObjectDisposed_ReaderClosed);
ThrowHelper.ThrowObjectDisposedException_ReaderClosed();
}

int n = _length - _pos;
Expand Down Expand Up @@ -126,7 +127,7 @@ public override int Read(Span<char> buffer)

if (_s == null)
nietras marked this conversation as resolved.
Show resolved Hide resolved
{
throw new ObjectDisposedException(null, SR.ObjectDisposed_ReaderClosed);
ThrowHelper.ThrowObjectDisposedException_ReaderClosed();
}

int n = _length - _pos;
Expand All @@ -150,7 +151,7 @@ public override string ReadToEnd()
{
if (_s == null)
{
throw new ObjectDisposedException(null, SR.ObjectDisposed_ReaderClosed);
ThrowHelper.ThrowObjectDisposedException_ReaderClosed();
}

string s;
Expand All @@ -177,36 +178,34 @@ public override string ReadToEnd()
{
if (_s == null)
nietras marked this conversation as resolved.
Show resolved Hide resolved
{
throw new ObjectDisposedException(null, SR.ObjectDisposed_ReaderClosed);
ThrowHelper.ThrowObjectDisposedException_ReaderClosed();
}
if ((uint)_pos >= (uint)_length)
nietras marked this conversation as resolved.
Show resolved Hide resolved
return null;

int i = _pos;
while (i < _length)
ReadOnlySpan<char> remaining = _s.AsSpan(_pos);
int foundLineLength = remaining.IndexOfAny('\r', '\n');
if (foundLineLength >= 0)
{
char ch = _s[i];
if (ch == '\r' || ch == '\n')
string result = foundLineLength == 0
nietras marked this conversation as resolved.
Show resolved Hide resolved
? string.Empty
: new string(new ReadOnlySpan<char>(ref Unsafe.AsRef(remaining.GetPinnableReference()), foundLineLength)); //_s.Substring(_pos, foundLineLength);
nietras marked this conversation as resolved.
Show resolved Hide resolved

char ch = remaining[foundLineLength];
_pos += foundLineLength + 1;
if (ch == '\r' && _pos < _length && _s[_pos] == '\n')
{
string result = _s.Substring(_pos, i - _pos);
_pos = i + 1;
if (ch == '\r' && _pos < _length && _s[_pos] == '\n')
{
_pos++;
}

return result;
_pos++;
}

i++;
return result;
}

if (i > _pos)
else
{
string result = _s.Substring(_pos, i - _pos);
_pos = i;
string result = new string(remaining); // _s.Substring(_pos, _length - _pos);
_pos = _length;
return result;
}

return null;
}

#region Task based Async APIs
Expand Down
6 changes: 6 additions & 0 deletions src/libraries/System.Private.CoreLib/src/System/ThrowHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,12 @@ internal static void ThrowObjectDisposedException_FileClosed()
throw new ObjectDisposedException(null, SR.ObjectDisposed_FileClosed);
}

[DoesNotReturn]
internal static void ThrowObjectDisposedException_ReaderClosed()
nietras marked this conversation as resolved.
Show resolved Hide resolved
{
throw new ObjectDisposedException(null, SR.ObjectDisposed_ReaderClosed);
}

[DoesNotReturn]
internal static void ThrowObjectDisposedException(ExceptionResource resource)
{
Expand Down