Skip to content

Replace boxing Stacks in BamlReader, decrease allocs, improve performance #9397

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
merged 2 commits into from
Sep 18, 2024
Merged

Replace boxing Stacks in BamlReader, decrease allocs, improve performance #9397

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09ea714
replace boxing Stack with generic Stack<bool> in BamlReader
h3xds1nz Jul 13, 2024
d680df8
replace _nodeStack with generic stack for code quality, make it readonly
h3xds1nz Jul 14, 2024
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
44 changes: 22 additions & 22 deletions src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public BamlReader(Stream bamlStream)
_properties = new ArrayList();
_haveUnprocessedRecord = false;
_deferableContentBlockDepth = -1;
_nodeStack = new Stack();
_nodeStack = new Stack<BamlNodeInfo>();
_reverseXmlnsTable = new Dictionary<String, List<String>>();
}

Expand Down Expand Up @@ -1447,9 +1447,9 @@ private BamlKeyInfo ProcessKeyTree()
// track of when we have entered a constructor parameter section and when
// we have written out the first parameter to handle adding commas between
// constructor parameters.
Stack readProperty = new Stack();
Stack readConstructor = new Stack();
Stack readFirstConstructor = new Stack();
Stack<bool> readProperty = new();
Stack<bool> readConstructor = new();
Stack<bool> readFirstConstructor = new();
readProperty.Push(false); // Property has not yet been read
readConstructor.Push(false); // Constructor section has not been read
readFirstConstructor.Push(false); // First constructor parameter has not been read
Expand Down Expand Up @@ -1493,8 +1493,8 @@ private BamlKeyInfo ProcessKeyTree()

case BamlRecordType.PropertyComplexStart:
ReadPropertyComplexStartRecord();
nodeInfo = (BamlNodeInfo)_nodeStack.Pop();
if ((bool)readProperty.Pop())
nodeInfo = _nodeStack.Pop();
if (readProperty.Pop())
{
markupString += ", ";
}
Expand All @@ -1520,12 +1520,12 @@ private BamlKeyInfo ProcessKeyTree()
// If the text contains '{' or '}' then we have to escape these
// so that it won't be interpreted as a MarkupExtension
string escapedString = EscapeString(((BamlTextRecord)_currentBamlRecord).Value);
if ((bool)readFirstConstructor.Peek())
if (readFirstConstructor.Peek())
{
markupString += ", ";
}
markupString += escapedString;
if ((bool)readConstructor.Peek())
if (readConstructor.Peek())
{
readFirstConstructor.Pop();
readFirstConstructor.Push(true);
Expand All @@ -1534,11 +1534,11 @@ private BamlKeyInfo ProcessKeyTree()

case BamlRecordType.ElementStart:
// Process commas between constructor parameters
if ((bool)readFirstConstructor.Peek())
if (readFirstConstructor.Peek())
{
markupString += ", ";
}
if ((bool)readConstructor.Peek())
if (readConstructor.Peek())
{
readFirstConstructor.Pop();
readFirstConstructor.Push(true);
Expand Down Expand Up @@ -1585,11 +1585,11 @@ private BamlKeyInfo ProcessKeyTree()

case BamlRecordType.ConstructorParameterType:
// Process commas between constructor parameters
if ((bool)readFirstConstructor.Peek())
if (readFirstConstructor.Peek())
{
markupString += ", ";
}
if ((bool)readConstructor.Peek())
if (readConstructor.Peek())
{
readFirstConstructor.Pop();
readFirstConstructor.Push(true);
Expand All @@ -1603,7 +1603,7 @@ private BamlKeyInfo ProcessKeyTree()
{
string value = ((BamlPropertyRecord)_currentBamlRecord).Value;
BamlPropertyInfo propertyInfo = ReadPropertyRecordCore(value);
if ((bool)readProperty.Pop())
if (readProperty.Pop())
{
markupString += ", ";
}
Expand All @@ -1615,7 +1615,7 @@ private BamlKeyInfo ProcessKeyTree()
case BamlRecordType.PropertyCustom:
{
BamlPropertyInfo propertyInfo = GetPropertyCustomRecordInfo();
if ((bool)readProperty.Pop())
if (readProperty.Pop())
{
markupString += ", ";
}
Expand All @@ -1628,7 +1628,7 @@ private BamlKeyInfo ProcessKeyTree()
{
string value = MapTable.GetStringFromStringId(((BamlPropertyStringReferenceRecord)_currentBamlRecord).StringId);
BamlPropertyInfo propertyInfo = ReadPropertyRecordCore(value);
if ((bool)readProperty.Pop())
if (readProperty.Pop())
{
markupString += ", ";
}
Expand All @@ -1642,7 +1642,7 @@ private BamlKeyInfo ProcessKeyTree()
string value = GetTypeValueString(((BamlPropertyTypeReferenceRecord)_currentBamlRecord).TypeId);
string attributeName = MapTable.GetAttributeNameFromId(
((BamlPropertyTypeReferenceRecord)_currentBamlRecord).AttributeId);
if ((bool)readProperty.Pop())
if (readProperty.Pop())
{
markupString += ", ";
}
Expand All @@ -1656,7 +1656,7 @@ private BamlKeyInfo ProcessKeyTree()
string value = GetExtensionValueString((BamlPropertyWithExtensionRecord)_currentBamlRecord);
string attributeName = MapTable.GetAttributeNameFromId(
((BamlPropertyWithExtensionRecord)_currentBamlRecord).AttributeId);
if ((bool)readProperty.Pop())
if (readProperty.Pop())
{
markupString += ", ";
}
Expand Down Expand Up @@ -1842,7 +1842,7 @@ private void ReadDocumentEndRecord()
{
// Pop information off the node stack to ensure we have matched all the
// start and end nodes and have nothing left but the start document node.
BamlNodeInfo nodeInfo = (BamlNodeInfo)_nodeStack.Pop();
BamlNodeInfo nodeInfo = _nodeStack.Pop();
if (nodeInfo.RecordType != BamlRecordType.DocumentStart)
{
throw new InvalidOperationException(SR.Format(SR.BamlScopeError,
Expand Down Expand Up @@ -2025,7 +2025,7 @@ private void ReadElementEndRecord()
// Pop information off the node stack that tells us what element this
// is the end of. Check to make sure the record on the stack is for a
// start element.
BamlNodeInfo nodeInfo = (BamlNodeInfo)_nodeStack.Pop();
BamlNodeInfo nodeInfo = _nodeStack.Pop();
if (nodeInfo.RecordType != BamlRecordType.ElementStart)
{
throw new InvalidOperationException(SR.Format(SR.BamlScopeError,
Expand Down Expand Up @@ -2112,7 +2112,7 @@ private void ReadPropertyComplexEndRecord()
// Pop information off the node info stack that tells us what the starting
// record was for this ending record. Check to make sure it is the
// correct type. If not, throw an exception.
BamlNodeInfo nodeInfo = (BamlNodeInfo)_nodeStack.Pop();
BamlNodeInfo nodeInfo = _nodeStack.Pop();
BamlRecordType expectedType;
switch (nodeInfo.RecordType)
{
Expand Down Expand Up @@ -2240,7 +2240,7 @@ private void ReadConstructorEnd()
// Pop information off the node stack that tells us what element this
// is the end of. Check to make sure the record on the stack is for a
// start element.
BamlNodeInfo nodeInfo = (BamlNodeInfo)_nodeStack.Pop();
BamlNodeInfo nodeInfo = _nodeStack.Pop();
if (nodeInfo.RecordType != BamlRecordType.ConstructorParametersStart)
{
throw new InvalidOperationException(SR.Format(SR.BamlScopeError,
Expand Down Expand Up @@ -2842,7 +2842,7 @@ private BamlMapTable MapTable
private BamlAttributeUsage _attributeUsage;

// Stack of node information about the element tree being built.
private Stack _nodeStack;
private readonly Stack<BamlNodeInfo> _nodeStack;

// Context information used when reading baml file. This contains the XamlTypeMapper used
// for resolving binary property information into strings.
Expand Down