Skip to content

Optimize XUI/XML parsing: LLXMLNode, LLStringTable, LLInitParam, LLXUIParser #313

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
RyeMutt merged 9 commits into from
Jun 15, 2026
Merged

Optimize XUI/XML parsing: LLXMLNode, LLStringTable, LLInitParam, LLXUIParser #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a438edd
llxml: modernize LLXMLNode construction, tidy escapeXML
RyeMutt Jun 14, 2026
7e40561
llxml: cut allocations and O(n^2) value building in the parser
RyeMutt Jun 14, 2026
51afe87
llxml: avoid per-chunk allocation in LLXmlTreeParser::characterData
RyeMutt Jun 14, 2026
6816280
llxml: add LLXMLNode unit tests
RyeMutt Jun 14, 2026
4296a19
llcommon: drop dead string-table hash_map paths, modernize LLStringTable
RyeMutt Jun 14, 2026
010dcb0
llui: fix LLXUIParser defects and trim the read hot path
RyeMutt Jun 14, 2026
234eab4
llcommon: reimplement LLInitParam LazyValue over std::unique_ptr
RyeMutt Jun 14, 2026
927c92e
llcommon: LLInitParam defect fixes, copy reductions, and moves
RyeMutt Jun 14, 2026
3a00b95
llxml: address review - guard mCurrent, use %u for U32 sscanf
RyeMutt Jun 14, 2026
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
50 changes: 26 additions & 24 deletions indra/llcommon/llinitparam.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
#include "llinitparam.h"
#include "llformat.h"

#include <unordered_set>


namespace LLInitParam
{
Expand Down Expand Up @@ -145,7 +147,7 @@ namespace LLInitParam

if (param->mValidationFunc)
{
mValidationList.push_back(std::make_pair(param->mParamHandle, param->mValidationFunc));
mValidationList.emplace_back(param->mParamHandle, param->mValidationFunc);
}
}

Expand Down Expand Up @@ -246,6 +248,16 @@ namespace LLInitParam
}
}

// Precompute the set of unnamed (implicit) param handles so the loop
// below can skip already-serialized params in O(1) instead of rescanning
// mUnnamedParams for every named param.
std::unordered_set<param_handle_t> unnamed_handles;
unnamed_handles.reserve(block_data.mUnnamedParams.size());
for (const ParamDescriptorPtr& ptr : block_data.mUnnamedParams)
{
unnamed_handles.insert(ptr->mParamHandle);
}

for (const BlockDescriptor::param_map_t::value_type& pair : block_data.mNamedParams)
{
param_handle_t param_handle = pair.second->mParamHandle;
Expand All @@ -255,24 +267,14 @@ namespace LLInitParam
{
// Ensure this param has not already been serialized
// Prevents <rect> from being serialized as its own tag.
bool duplicate = false;
for (const ParamDescriptorPtr& ptr : block_data.mUnnamedParams)
{
if (param_handle == ptr->mParamHandle)
{
duplicate = true;
break;
}
}

//FIXME: for now, don't attempt to serialize values under synonyms, as current parsers
// don't know how to detect them
if (duplicate)
if (unnamed_handles.find(param_handle) != unnamed_handles.end())
{
continue;
}

name_stack.push_back(std::make_pair(pair.first, !duplicate));
name_stack.emplace_back(pair.first, true);
const Param* diff_param = diff_block ? diff_block->getParamFromHandle(param_handle) : NULL;
serialized |= serialize_func(*param, parser, name_stack, predicate_rule, diff_param);
name_stack.pop_back();
Expand Down Expand Up @@ -300,12 +302,20 @@ namespace LLInitParam
ParamDescriptor::inspect_func_t inspect_func = ptr->mInspectFunc;
if (inspect_func)
{
name_stack.push_back(std::make_pair("", true));
name_stack.emplace_back("", true);
inspect_func(*param, parser, name_stack, ptr->mMinCount, ptr->mMaxCount);
name_stack.pop_back();
}
}

// Precompute unnamed (implicit) param handles for O(1) duplicate checks.
std::unordered_set<param_handle_t> unnamed_handles;
unnamed_handles.reserve(block_data.mUnnamedParams.size());
for (const ParamDescriptorPtr& ptr : block_data.mUnnamedParams)
{
unnamed_handles.insert(ptr->mParamHandle);
}

for(const BlockDescriptor::param_map_t::value_type& pair : block_data.mNamedParams)
{
param_handle_t param_handle = pair.second->mParamHandle;
Expand All @@ -314,17 +324,9 @@ namespace LLInitParam
if (inspect_func)
{
// Ensure this param has not already been inspected
bool duplicate = false;
for (const ParamDescriptorPtr &ptr : block_data.mUnnamedParams)
{
if (param_handle == ptr->mParamHandle)
{
duplicate = true;
break;
}
}
bool duplicate = unnamed_handles.find(param_handle) != unnamed_handles.end();

name_stack.push_back(std::make_pair(pair.first, !duplicate));
name_stack.emplace_back(pair.first, !duplicate);
inspect_func(*param, parser, name_stack, pair.second->mMinCount, pair.second->mMaxCount);
name_stack.pop_back();
}
Expand Down
Loading
Loading