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

Jump to bottom

Improve load times by skipping serialization of entities when unecessary. #2596

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Improve load times by skipping serialization of entities when unecessary. #2596

Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3b1ca48
A hack to greatly improve load times
arjo129 Sep 5, 2024
da543ab
Remove magic word
arjo129 Sep 12, 2024
beadb78
Send empty string instead of using sentinel value.
arjo129 Sep 12, 2024
4a833ac
Merge branch 'gz-sim9' into arjo/fix/a_hack_to_greatly_improve_loadtimes
arjo129 Oct 1, 2024
b4865d5
Style
arjo129 Oct 11, 2024
018e86d
Merge branch 'arjo/fix/a_hack_to_greatly_improve_loadtimes' of https:…
arjo129 Oct 11, 2024
5565815
fix custom sensor system example build (#2649)
iche033 Oct 11, 2024
e0d28aa
Merge remote-tracking branch 'origin/main' into arjo/fix/a_hack_to_gr…
arjo129 Oct 13, 2024
ccb8546
Merge branch 'gz-sim9' into arjo/fix/a_hack_to_greatly_improve_loadtimes
arjo129 Oct 13, 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
17 changes: 15 additions & 2 deletions include/gz/sim/components/Model.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,18 @@ namespace serializers
}
}

if (!skip)
{
_out << "<?xml version=\"1.0\" ?>"
<< "<sdf version='" << SDF_PROTOCOL_VERSION << "'>"
<< (skip ? std::string() : modelElem->ToString(""))
<< "</sdf>";
arjo129 marked this conversation as resolved.
Show resolved Hide resolved

}
else
{
_out << "";
}
return _out;
}

Expand All @@ -89,13 +97,18 @@ namespace serializers
public: static std::istream &Deserialize(std::istream &_in,
sdf::Model &_model)
{
sdf::Root root;
std::string sdf(std::istreambuf_iterator<char>(_in), {});
if (sdf.empty())
{
return _in;
}

// Its super expensive to create an SDFElement for some reason
sdf::Root root;
sdf::Errors errors = root.LoadSdfString(sdf);
if (!root.Model())
{
gzwarn << "Unable to deserialize sdf::Model" << std::endl;
gzwarn << "Unable to deserialize sdf::Model " << sdf<< std::endl;
return _in;
}

Expand Down
Loading