Skip to content

J
json
Unverified Commit b1441f34 by Niels Lohmann
Options

⚡ micro-optimizations for dump()

Indentation string is recycled to avoid allocations. Comma-separation in objects does not need an if any more. Cachegrind measures 1% performance improvement.
parent bd0326cb
Showing with 34 additions and 28 deletions
src/json.hpp
...@@ -8430,34 +8430,36 @@ class basic_json ...@@ -8430,34 +8430,36 @@ class basic_json
// variable to hold indentation for recursive calls // variable to hold indentation for recursive calls
const auto new_indent = current_indent + indent_step; const auto new_indent = current_indent + indent_step;
const std::string indent_string = string_t(new_indent, ' '); string_t indent_string = string_t(new_indent, ' ');
for (auto i = m_value.object->cbegin(); i != m_value.object->cend(); ++i) auto i = m_value.object->cbegin();
for (size_t cnt = 0; cnt < m_value.object->size() - 1; ++cnt, ++i)
{ {
if (i != m_value.object->cbegin())
{
o << ",\n";
}
o << indent_string << '\"' << escape_string(i->first) << "\": "; o << indent_string << '\"' << escape_string(i->first) << "\": ";
i->second.dump(o, true, indent_step, new_indent); i->second.dump(o, true, indent_step, new_indent);
o << ",\n";
} }
o << '\n' << string_t(current_indent, ' ') + '}'; o << indent_string << '\"' << escape_string(i->first) << "\": ";
i->second.dump(o, true, indent_step, new_indent);
indent_string.resize(current_indent);
o << '\n' << indent_string << '}';
} }
else else
{ {
o << '{'; o << '{';
for (auto i = m_value.object->cbegin(); i != m_value.object->cend(); ++i) auto i = m_value.object->cbegin();
for (size_t cnt = 0; cnt < m_value.object->size() - 1; ++cnt, ++i)
{ {
if (i != m_value.object->cbegin())
{
o << ',';
}
o << '\"' << escape_string(i->first) << "\":"; o << '\"' << escape_string(i->first) << "\":";
i->second.dump(o, false, indent_step, current_indent); i->second.dump(o, false, indent_step, current_indent);
o << ',';
} }
o << '\"' << escape_string(i->first) << "\":";
i->second.dump(o, false, indent_step, current_indent);
o << '}'; o << '}';
} }
...@@ -8478,7 +8480,7 @@ class basic_json ...@@ -8478,7 +8480,7 @@ class basic_json
// variable to hold indentation for recursive calls // variable to hold indentation for recursive calls
const auto new_indent = current_indent + indent_step; const auto new_indent = current_indent + indent_step;
const std::string indent_string = string_t(new_indent, ' '); string_t indent_string = string_t(new_indent, ' ');
for (auto i = m_value.array->cbegin(); i != m_value.array->cend() - 1; ++i) for (auto i = m_value.array->cbegin(); i != m_value.array->cend() - 1; ++i)
{ {
...@@ -8491,7 +8493,8 @@ class basic_json ...@@ -8491,7 +8493,8 @@ class basic_json
assert(not m_value.array->empty()); assert(not m_value.array->empty());
m_value.array->back().dump(o, true, indent_step, new_indent); m_value.array->back().dump(o, true, indent_step, new_indent);
o << '\n' << string_t(current_indent, ' ') << ']'; indent_string.resize(current_indent);
o << '\n' << indent_string << ']';
} }
else else
{ {
......
src/json.hpp.re2c
...@@ -8430,34 +8430,36 @@ class basic_json ...@@ -8430,34 +8430,36 @@ class basic_json
// variable to hold indentation for recursive calls // variable to hold indentation for recursive calls
const auto new_indent = current_indent + indent_step; const auto new_indent = current_indent + indent_step;
const std::string indent_string = string_t(new_indent, ' '); string_t indent_string = string_t(new_indent, ' ');
for (auto i = m_value.object->cbegin(); i != m_value.object->cend(); ++i) auto i = m_value.object->cbegin();
for (size_t cnt = 0; cnt < m_value.object->size() - 1; ++cnt, ++i)
{ {
if (i != m_value.object->cbegin())
{
o << ",\n";
}
o << indent_string << '\"' << escape_string(i->first) << "\": "; o << indent_string << '\"' << escape_string(i->first) << "\": ";
i->second.dump(o, true, indent_step, new_indent); i->second.dump(o, true, indent_step, new_indent);
o << ",\n";
} }
o << '\n' << string_t(current_indent, ' ') + '}'; o << indent_string << '\"' << escape_string(i->first) << "\": ";
i->second.dump(o, true, indent_step, new_indent);
indent_string.resize(current_indent);
o << '\n' << indent_string << '}';
} }
else else
{ {
o << '{'; o << '{';
for (auto i = m_value.object->cbegin(); i != m_value.object->cend(); ++i) auto i = m_value.object->cbegin();
for (size_t cnt = 0; cnt < m_value.object->size() - 1; ++cnt, ++i)
{ {
if (i != m_value.object->cbegin())
{
o << ',';
}
o << '\"' << escape_string(i->first) << "\":"; o << '\"' << escape_string(i->first) << "\":";
i->second.dump(o, false, indent_step, current_indent); i->second.dump(o, false, indent_step, current_indent);
o << ',';
} }
o << '\"' << escape_string(i->first) << "\":";
i->second.dump(o, false, indent_step, current_indent);
o << '}'; o << '}';
} }
...@@ -8478,7 +8480,7 @@ class basic_json ...@@ -8478,7 +8480,7 @@ class basic_json
// variable to hold indentation for recursive calls // variable to hold indentation for recursive calls
const auto new_indent = current_indent + indent_step; const auto new_indent = current_indent + indent_step;
const std::string indent_string = string_t(new_indent, ' '); string_t indent_string = string_t(new_indent, ' ');
for (auto i = m_value.array->cbegin(); i != m_value.array->cend() - 1; ++i) for (auto i = m_value.array->cbegin(); i != m_value.array->cend() - 1; ++i)
{ {
...@@ -8491,7 +8493,8 @@ class basic_json ...@@ -8491,7 +8493,8 @@ class basic_json
assert(not m_value.array->empty()); assert(not m_value.array->empty());
m_value.array->back().dump(o, true, indent_step, new_indent); m_value.array->back().dump(o, true, indent_step, new_indent);
o << '\n' << string_t(current_indent, ' ') << ']'; indent_string.resize(current_indent);
o << '\n' << indent_string << ']';
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment