MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2025-02-18 01:30:12 +01:00
Code Issues Releases Wiki Activity

ircd::json: Sort json::member vectors on stringify; w/ recursive reentrance.

Browse source
This commit is contained in:
Jason Volk 2018-03-21 13:49:59 -07:00
parent 0483a381f8
commit 99608b6bd2
1 changed files with 37 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
ircd/json.cc
View file

@ -1430,22 +1430,55 @@ ircd::string_view
ircd::json::stringify(mutable_buffer &buf,
const member *const &b,
const member *const &e)
try
{
using member_array = std::array<const member *, iov::MAX_SIZE>;
using member_arrays = std::array<member_array, object::max_recursion_depth>;
static_assert(sizeof(member_arrays) == 256_KiB);
thread_local member_arrays ma;
thread_local size_t mctr;
const size_t mc{mctr++};
assert(mc < ma.size());
const unwind uw{[&mc]
{
--mctr;
assert(mctr == mc);
}};
size_t i(0);
auto &m{ma.at(mc)};
for(auto it(b); it != e; ++it)
m.at(i++) = it;
std::sort(begin(m), begin(m) + i, []
(const member *const &a, const member *const &b)
{
return *a < *b;
});
static const auto print_member
{
[](mutable_buffer &buf, const member &m)
[](mutable_buffer &buf, const member *const &m)
{
printer(buf, printer.name << printer.name_sep, m.first);
stringify(buf, m.second);
printer(buf, printer.name << printer.name_sep, m->first);
stringify(buf, m->second);
}
};
char *const start{begin(buf)};
printer(buf, printer.object_begin);
printer::list_protocol(buf, b, e, print_member);
printer::list_protocol(buf, m.data(), m.data() + i, print_member);
printer(buf, printer.object_end);
return { start, begin(buf) };
}
catch(const std::out_of_range &)
{
throw print_error
{
"Too many members (%zd) for stringifying", std::distance(b, e)
};
}
size_t
ircd::json::serialized(const members &m)