Skip to content

Add tests and improve binary XmlDictionaryReader performance #73332

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
StephenMolloy merged 18 commits into from
Aug 15, 2022
Merged

Add tests and improve binary XmlDictionaryReader performance #73332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
472e327
Read primitive types more efficient
Daniel-Svensson Jun 30, 2022
64ee4ba
Allow stream to read more than minimum number of required bytes
Daniel-Svensson Jul 5, 2022
b002d7c
Remove pinning and pointer code from array reads
Daniel-Svensson Jul 7, 2022
3b6ece8
Remove bounds checks from remaing array reads
Daniel-Svensson Jul 7, 2022
3b8e2e8
remove extra unchecked
Daniel-Svensson Jul 26, 2022
53d26a7
cleanup code
Daniel-Svensson Jul 26, 2022
068da74
merge upstream/main
Daniel-Svensson Jul 26, 2022
110346e
Start adding tests
Daniel-Svensson Jul 26, 2022
62467b7
Add tests for binary XmlDictionaryReader
Daniel-Svensson Jul 26, 2022
fad0457
cleanup
Daniel-Svensson Jul 27, 2022
d5ce3a7
revert back to old byte read
Daniel-Svensson Jul 31, 2022
5aee35c
add test for arrays using "ref" enumeration
Daniel-Svensson Aug 3, 2022
929ca23
add guid test
Daniel-Svensson Aug 3, 2022
c689762
Try to read while arrays from stream before processing
Daniel-Svensson Aug 3, 2022
bfea922
Write guid arrays as memory on LittleEndian platforms
Daniel-Svensson Aug 3, 2022
98b53cc
Merge remote-tracking branch 'upstream/main' into binaryxmlreader
Daniel-Svensson Aug 14, 2022
51b4957
Update tests to be independent of byte order
Daniel-Svensson Aug 14, 2022
9a2f8bd
FIx bugs introduced in #71752
Daniel-Svensson Aug 14, 2022
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
61 changes: 27 additions & 34 deletions src/libraries/System.Private.DataContractSerialization/src/System/Xml/XmlBinaryReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;

namespace System.Xml
Expand Down Expand Up @@ -1250,10 +1251,7 @@ private unsafe int ReadArray(bool[] array, int offset, int count)
{
CheckArray(array, offset, count);
int actual = Math.Min(count, _arrayCount);
fixed (bool* items = &array[offset])
{
BufferReader.UnsafeReadArray((byte*)items, (byte*)&items[actual]);
}
BufferReader.ReadRawArrayBytes(array.AsSpan(offset, actual));
SkipArrayElements(actual);
return actual;
}
Expand All @@ -1276,10 +1274,7 @@ private unsafe int ReadArray(short[] array, int offset, int count)
{
CheckArray(array, offset, count);
int actual = Math.Min(count, _arrayCount);
fixed (short* items = &array[offset])
{
BufferReader.UnsafeReadArray((byte*)items, (byte*)&items[actual]);
}
BufferReader.ReadRawArrayBytes(array.AsSpan(offset, actual));
SkipArrayElements(actual);
return actual;
}
Expand All @@ -1302,10 +1297,7 @@ private unsafe int ReadArray(int[] array, int offset, int count)
{
CheckArray(array, offset, count);
int actual = Math.Min(count, _arrayCount);
fixed (int* items = &array[offset])
{
BufferReader.UnsafeReadArray((byte*)items, (byte*)&items[actual]);
}
BufferReader.ReadRawArrayBytes(array.AsSpan(offset, actual));
SkipArrayElements(actual);
return actual;
}
Expand All @@ -1328,10 +1320,7 @@ private unsafe int ReadArray(long[] array, int offset, int count)
{
CheckArray(array, offset, count);
int actual = Math.Min(count, _arrayCount);
fixed (long* items = &array[offset])
{
BufferReader.UnsafeReadArray((byte*)items, (byte*)&items[actual]);
}
BufferReader.ReadRawArrayBytes(array.AsSpan(offset, actual));
SkipArrayElements(actual);
return actual;
}
Expand All @@ -1354,10 +1343,7 @@ private unsafe int ReadArray(float[] array, int offset, int count)
{
CheckArray(array, offset, count);
int actual = Math.Min(count, _arrayCount);
fixed (float* items = &array[offset])
{
BufferReader.UnsafeReadArray((byte*)items, (byte*)&items[actual]);
}
BufferReader.ReadRawArrayBytes(array.AsSpan(offset, actual));
SkipArrayElements(actual);
return actual;
}
Expand All @@ -1380,10 +1366,7 @@ private unsafe int ReadArray(double[] array, int offset, int count)
{
CheckArray(array, offset, count);
int actual = Math.Min(count, _arrayCount);
fixed (double* items = &array[offset])
{
BufferReader.UnsafeReadArray((byte*)items, (byte*)&items[actual]);
}
BufferReader.ReadRawArrayBytes(array.AsSpan(offset, actual));
SkipArrayElements(actual);
return actual;
}
Expand All @@ -1406,10 +1389,7 @@ private unsafe int ReadArray(decimal[] array, int offset, int count)
{
CheckArray(array, offset, count);
int actual = Math.Min(count, _arrayCount);
fixed (decimal* items = &array[offset])
{
BufferReader.UnsafeReadArray((byte*)items, (byte*)&items[actual]);
}
BufferReader.ReadRawArrayBytes(array.AsSpan(offset, actual));
SkipArrayElements(actual);
return actual;
}
Expand All @@ -1433,9 +1413,11 @@ private int ReadArray(DateTime[] array, int offset, int count)
{
CheckArray(array, offset, count);
int actual = Math.Min(count, _arrayCount);
for (int i = 0; i < actual; i++)
// Try to read in whole array, but don't fail if not possible
BufferReader.GetBuffer(actual * ValueHandleLength.DateTime, out _, out _);
Copy link
Contributor Author

@Daniel-Svensson Daniel-Svensson Aug 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Se comment on UnsafeReadarray/ReadRawArrayBytes about chunked reads, if it should be added back then these GetBuffer calls should probably be removed
  2. Is it better to use overload with a single out parameter that throws an exception directly if the file ends prematurely ? The current approach keeps the old behaviour where these "special" types will partially fill arrays in case of premature end-of-file

foreach (ref DateTime item in array.AsSpan(offset, actual))
{
array[offset + i] = BufferReader.ReadDateTime();
item = BufferReader.ReadDateTime();
}
SkipArrayElements(actual);
return actual;
Expand All @@ -1460,9 +1442,18 @@ private int ReadArray(Guid[] array, int offset, int count)
{
CheckArray(array, offset, count);
int actual = Math.Min(count, _arrayCount);
for (int i = 0; i < actual; i++)
if (BitConverter.IsLittleEndian)
{
array[offset + i] = BufferReader.ReadGuid();
BufferReader.ReadRawArrayBytes(array.AsSpan(offset, actual));
}
else
{
// Try to read in whole array, but don't fail if not possible
BufferReader.GetBuffer(actual * ValueHandleLength.Guid, out _, out _);
foreach (ref Guid item in array.AsSpan(offset, actual))
{
item = BufferReader.ReadGuid();
}
}
SkipArrayElements(actual);
return actual;
Expand All @@ -1487,9 +1478,11 @@ private int ReadArray(TimeSpan[] array, int offset, int count)
{
CheckArray(array, offset, count);
int actual = Math.Min(count, _arrayCount);
for (int i = 0; i < actual; i++)
// Try to read in whole array, but don't fail if not possible
BufferReader.GetBuffer(actual * ValueHandleLength.TimeSpan, out _, out _);
foreach (ref TimeSpan item in array.AsSpan(offset, actual))
{
array[offset + i] = BufferReader.ReadTimeSpan();
item = BufferReader.ReadTimeSpan();
}
SkipArrayElements(actual);
return actual;
Expand Down
Loading