Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2026-05-08 09:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: revert buffer reserve space (#5528)

Browse Source 
* Revert "refactor: use BufferReader, BufferWriter as function args (#5518)"

This reverts commit c2d48a7d11.

* Revert "fixup! refactor: add BufferReader, BufferWriter::reserve_space() (#5513)"

This reverts commit b08e17beef.

* Revert "refactor: add BufferReader, BufferWriter::reserve_space() (#5513)"

This reverts commit 51fd7056ba.
This commit is contained in:
Charles Kerr
2023-05-14 17:24:42 -05:00
committed by GitHub
parent e88bf946e1
commit 2cf9678737
13 changed files with 436 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libtransmission/variant-json.cc
+30 -43
View File
@@ -36,6 +36,7 @@
#include "libtransmission/variant.h"
using namespace std::literals;
using Buffer = libtransmission::Buffer;
namespace
{
@@ -442,7 +443,7 @@ struct JsonWalk
}
std::deque<ParentState> parents;
libtransmission::Buffer out;
Buffer out;
bool doIndent;
};
@@ -546,27 +547,25 @@ void jsonBoolFunc(tr_variant const* val, void* vdata)
void jsonRealFunc(tr_variant const* val, void* vdata)
{
auto* const data = static_cast<struct JsonWalk*>(vdata);
auto const [buf, buflen] = data->out.reserve_space(64);
auto* walk = reinterpret_cast<char*>(buf);
auto const* const begin = walk;
auto* data = static_cast<struct JsonWalk*>(vdata);
if (fabs(val->val.d - (int)val->val.d) < 0.00001)
{
walk = fmt::format_to(walk, FMT_COMPILE("{:.0f}"), val->val.d);
auto buf = std::array<char, 64>{};
auto const* const out = fmt::format_to(std::data(buf), FMT_COMPILE("{:.0f}"), val->val.d);
data->out.add(std::data(buf), static_cast<size_t>(out - std::data(buf)));
}
else
{
walk = fmt::format_to(walk, FMT_COMPILE("{:.4f}"), val->val.d);
auto buf = std::array<char, 64>{};
auto const* const out = fmt::format_to(std::data(buf), FMT_COMPILE("{:.4f}"), val->val.d);
data->out.add(std::data(buf), static_cast<size_t>(out - std::data(buf)));
}
data->out.commit_space(walk - begin);
jsonChildFunc(data);
}
[[nodiscard]] char* write_escaped_char(char* buf, char const* const end, std::string_view& sv)
void write_escaped_char(Buffer& out, std::string_view& sv)
{
auto u16buf = std::array<std::uint16_t, 2>{};
@@ -578,97 +577,85 @@ void jsonRealFunc(tr_variant const* val, void* vdata)
for (auto it = std::cbegin(u16buf); it != end16; ++it)
{
buf = fmt::format_to_n(buf, end - buf - 1, FMT_COMPILE("\\u{:04x}"), *it).out;
auto arr = std::array<char, 16>{};
auto const result = fmt::format_to_n(std::data(arr), std::size(arr), FMT_COMPILE("\\u{:04x}"), *it);
out.add(std::data(arr), result.size);
}
sv.remove_prefix(walk8 - begin8 - 1);
return buf;
}
void jsonStringFunc(tr_variant const* val, void* vdata)
{
auto* const data = static_cast<struct JsonWalk*>(vdata);
auto* data = static_cast<struct JsonWalk*>(vdata);
auto sv = std::string_view{};
(void)!tr_variantGetStrView(val, &sv);
auto& out = data->out;
auto const [buf, buflen] = out.reserve_space(std::size(sv) * 6 + 2);
auto* walk = reinterpret_cast<char*>(buf);
auto const* const begin = walk;
auto const* const end = begin + buflen;
*walk++ = '"';
out.reserve(std::size(data->out) + std::size(sv) * 6 + 2);
out.push_back('"');
for (; !std::empty(sv); sv.remove_prefix(1))
{
switch (sv.front())
{
case '\b':
*walk++ = '\\';
*walk++ = 'b';
out.add(R"(\b)"sv);
break;
case '\f':
*walk++ = '\\';
*walk++ = 'f';
out.add(R"(\f)"sv);
break;
case '\n':
*walk++ = '\\';
*walk++ = 'n';
out.add(R"(\n)"sv);
break;
case '\r':
*walk++ = '\\';
*walk++ = 'r';
out.add(R"(\r)"sv);
break;
case '\t':
*walk++ = '\\';
*walk++ = 't';
out.add(R"(\t)"sv);
break;
case '"':
*walk++ = '\\';
*walk++ = '"';
out.add(R"(\")"sv);
break;
case '\\':
*walk++ = '\\';
*walk++ = '\\';
out.add(R"(\\)"sv);
break;
default:
if (isprint((unsigned char)sv.front()) != 0)
{
*walk++ = sv.front();
out.push_back(sv.front());
}
else
{
try
{
walk = write_escaped_char(walk, end, sv);
write_escaped_char(out, sv);
}
catch (utf8::exception const&)
{
*walk++ = '?';
out.push_back('?');
}
}
break;
}
}
*walk++ = '"';
TR_ASSERT(walk <= end);
out.commit_space(walk - begin);
out.push_back('"');
jsonChildFunc(data);
}
void jsonDictBeginFunc(tr_variant const* val, void* vdata)
{
auto* const data = static_cast<struct JsonWalk*>(vdata);
auto* data = static_cast<struct JsonWalk*>(vdata);
jsonPushParent(data, val);
data->out.push_back('{');
@@ -682,7 +669,7 @@ void jsonDictBeginFunc(tr_variant const* val, void* vdata)
void jsonListBeginFunc(tr_variant const* val, void* vdata)
{
size_t const n_children = tr_variantListSize(val);
auto* const data = static_cast<struct JsonWalk*>(vdata);
auto* data = static_cast<struct JsonWalk*>(vdata);
jsonPushParent(data, val);
data->out.push_back('[');
@@ -695,7 +682,7 @@ void jsonListBeginFunc(tr_variant const* val, void* vdata)
void jsonContainerEndFunc(tr_variant const* val, void* vdata)
{
auto* const data = static_cast<struct JsonWalk*>(vdata);
auto* data = static_cast<struct JsonWalk*>(vdata);
jsonPopParent(data);