MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-17 07:20:55 +01:00
Code Issues Releases Wiki Activity

ircd::json: Simplify/cleanup members stringify.

Browse source
This commit is contained in:
Jason Volk 2020-02-07 21:51:24 -08:00
parent ab6672877d
commit 622a0fe7c1
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ircd/json.cc
View file

@ -3163,7 +3163,6 @@ ircd::string_view
ircd::json::stringify(mutable_buffer &buf, ircd::json::stringify(mutable_buffer &buf,
const member *const &b, const member *const &b,
const member *const &e) const member *const &e)
try
{ {
using member_array = std::array<const member *, object::max_sorted_members>; using member_array = std::array<const member *, object::max_sorted_members>;
using member_arrays = std::array<member_array, object::max_recursion_depth>; using member_arrays = std::array<member_array, object::max_recursion_depth>;
@ -3171,7 +3170,8 @@ try
static const auto less_member static const auto less_member
{ {
[](const member *const &a, const member *const &b) noexcept [](const member *const &a, const member *const &b)
noexcept
{ {
return *a < *b; return *a < *b;
} }
@ -3188,21 +3188,28 @@ try
} }
}; };
const size_t count(std::distance(b, e));
if(unlikely(count > object::max_sorted_members))
throw print_error
{
"json::member vector of %zu exceeds maximum %zu.",
count,
object::max_sorted_members,
};
thread_local member_arrays ma; thread_local member_arrays ma;
thread_local size_t mctr; thread_local size_t mctr;
const size_t mc{mctr}; const size_t mc{mctr};
const scope_count _mc{mctr}; const scope_count _mc{mctr};
assert(mc < ma.size()); assert(mc < ma.size());
auto &m(ma.at(mc));
for(size_t i(0); i < count; ++i)
m[i] = b + i;
size_t i(0); std::sort(begin(m), begin(m) + count, less_member);
auto &m{ma.at(mc)}; const char *const start(begin(buf));
for(auto it(b); it != e; ++it)
m.at(i++) = it;
char *const start{begin(buf)};
std::sort(begin(m), begin(m) + i, less_member);
printer(buf, printer.object_begin); printer(buf, printer.object_begin);
printer::list_protocol(buf, m.data(), m.data() + i, print_member); printer::list_protocol(buf, begin(m), begin(m) + count, print_member);
printer(buf, printer.object_end); printer(buf, printer.object_end);
const string_view ret const string_view ret
{ {
@ -3212,13 +3219,6 @@ try
assert(serialized(b, e) == size(ret)); assert(serialized(b, e) == size(ret));
return ret; return ret;
} }
catch(const std::out_of_range &)
{
throw print_error
{
"Too many members (%zd) for stringifying", std::distance(b, e)
};
}
size_t size_t
ircd::json::serialized(const members &m) ircd::json::serialized(const members &m)