mirror of
https://github.com/yuzu-emu/discord-rpc.git
synced 2024-12-23 00:15:39 +00:00
Clean up this allocation junk
This commit is contained in:
parent
38c0599380
commit
866e6d1104
|
@ -83,12 +83,8 @@ extern "C" void Discord_UpdateConnection()
|
||||||
else {
|
else {
|
||||||
// reads
|
// reads
|
||||||
|
|
||||||
// json parser will use this buffer first, then allocate more if needed; I seriously doubt we send any messages that would use all of this, though.
|
|
||||||
char parseBuffer[32 * 1024];
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
PoolAllocator pa(parseBuffer, sizeof(parseBuffer));
|
JsonDocument message;
|
||||||
StackAllocator sa;
|
|
||||||
JsonDocument message(rapidjson::kObjectType, &pa, sizeof(sa.fixedBuffer_), &sa);
|
|
||||||
|
|
||||||
if (!Connection->Read(message)) {
|
if (!Connection->Read(message)) {
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -34,10 +34,7 @@ void RpcConnection::Open()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state == State::SentHandshake) {
|
if (state == State::SentHandshake) {
|
||||||
char parseBuffer[32 * 1024];
|
JsonDocument message;
|
||||||
PoolAllocator pa(parseBuffer, sizeof(parseBuffer));
|
|
||||||
StackAllocator sa;
|
|
||||||
JsonDocument message(rapidjson::kObjectType, &pa, sizeof(sa.fixedBuffer_), &sa);
|
|
||||||
if (Read(message)) {
|
if (Read(message)) {
|
||||||
auto cmd = message.FindMember("cmd");
|
auto cmd = message.FindMember("cmd");
|
||||||
if (cmd == message.MemberEnd() || !cmd->value.IsString()) {
|
if (cmd == message.MemberEnd() || !cmd->value.IsString()) {
|
||||||
|
|
|
@ -99,11 +99,24 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
using MallocAllocator = rapidjson::CrtAllocator;
|
using MallocAllocator = rapidjson::CrtAllocator;
|
||||||
extern MallocAllocator MallocAllocatorInst;
|
|
||||||
using PoolAllocator = rapidjson::MemoryPoolAllocator<MallocAllocator>;
|
using PoolAllocator = rapidjson::MemoryPoolAllocator<MallocAllocator>;
|
||||||
using UTF8 = rapidjson::UTF8<char>;
|
using UTF8 = rapidjson::UTF8<char>;
|
||||||
// Writer appears to need about 16 bytes per nested object level (with 64bit size_t)
|
// Writer appears to need about 16 bytes per nested object level (with 64bit size_t)
|
||||||
using StackAllocator = FixedLinearAllocator<2048>;
|
using StackAllocator = FixedLinearAllocator<2048>;
|
||||||
constexpr size_t WriterNestingLevels = 2048 / (2 * sizeof(size_t));
|
constexpr size_t WriterNestingLevels = 2048 / (2 * sizeof(size_t));
|
||||||
using JsonWriter = rapidjson::Writer<DirectStringBuffer, UTF8, UTF8, StackAllocator, rapidjson::kWriteNoFlags>;
|
using JsonWriter = rapidjson::Writer<DirectStringBuffer, UTF8, UTF8, StackAllocator, rapidjson::kWriteNoFlags>;
|
||||||
using JsonDocument = rapidjson::GenericDocument<UTF8, PoolAllocator, FixedLinearAllocator<2048>>;
|
using JsonDocumentBase = rapidjson::GenericDocument<UTF8, PoolAllocator, StackAllocator>;
|
||||||
|
class JsonDocument : public JsonDocumentBase
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
static const int kDefaultChunkCapacity = 32 * 1024;
|
||||||
|
// json parser will use this buffer first, then allocate more if needed; I seriously doubt we send any messages that would use all of this, though.
|
||||||
|
char parseBuffer_[32 * 1024];
|
||||||
|
MallocAllocator mallocAllocator_;
|
||||||
|
PoolAllocator poolAllocator_;
|
||||||
|
StackAllocator stackAllocator_;
|
||||||
|
JsonDocument() : JsonDocumentBase(rapidjson::kObjectType, &poolAllocator_, sizeof(stackAllocator_.fixedBuffer_), &stackAllocator_)
|
||||||
|
, poolAllocator_(parseBuffer_, sizeof(parseBuffer_), kDefaultChunkCapacity, &mallocAllocator_)
|
||||||
|
, stackAllocator_()
|
||||||
|
{}
|
||||||
|
};
|
||||||
|
|
Loading…
Reference in a new issue