sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-30 22:53:59 +00:00
Code Issues Releases Wiki Activity

move allocator to be a protected variable

Browse Source
This commit is contained in:
Kevin Ahrendt
2025-05-21 20:05:13 +00:00
parent 8ad4d3b6f5
commit 44f97e2de4
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
esphome/components/json/json_util.cpp
View File

@@ -8,23 +8,22 @@ namespace json {
static const char *const TAG = "json"; static const char *const TAG = "json";
static auto ALLOCATOR = RAMAllocator<uint8_t>(
RAMAllocator<uint8_t>::NONE); // Attempt to allocate in PSRAM before falling back into internal
// Build an allocator for the JSON Library using the RAMAllocator class // Build an allocator for the JSON Library using the RAMAllocator class
struct SpiRamAllocator : ArduinoJson::Allocator { struct SpiRamAllocator : ArduinoJson::Allocator {
void *allocate(size_t size) override { return ALLOCATOR.allocate(size); } void *allocate(size_t size) override { return this->allocator_.allocate(size); }
void deallocate(void *pointer) override { void deallocate(void *pointer) override {
// RAMAllocator requires passing the size of the allocated space which don't know, so use free directly
free(pointer); // NOLINT(cppcoreguidelines-owning-memory,cppcoreguidelines-no-malloc) free(pointer); // NOLINT(cppcoreguidelines-owning-memory,cppcoreguidelines-no-malloc)
} }
void *reallocate(void *ptr, size_t new_size) override { void *reallocate(void *ptr, size_t new_size) override {
return ALLOCATOR.reallocate(static_cast<uint8_t *>(ptr), new_size); return this->allocator_.reallocate(static_cast<uint8_t *>(ptr), new_size);
} }
};
static auto DOC_ALLOCATOR = SpiRamAllocator(); protected:
RAMAllocator<uint8_t> allocator_{RAMAllocator<uint8_t>(RAMAllocator<uint8_t>::NONE)};
};
std::string build_json(const json_build_t &f) { std::string build_json(const json_build_t &f) {
// Here we are allocating up to 5kb of memory, // Here we are allocating up to 5kb of memory,
@@ -32,9 +31,9 @@ std::string build_json(const json_build_t &f) {
// as we can not have a true dynamic sized document. // as we can not have a true dynamic sized document.
// The excess memory is freed below with `shrinkToFit()` // The excess memory is freed below with `shrinkToFit()`
while (true) { while (true) {
ESP_LOGV(TAG, "Attempting to allocate %zu bytes for JSON serialization", request_size); auto DOC_ALLOCATOR = SpiRamAllocator();
DynamicJsonDocument json_document(request_size); JsonDocument json_document(&DOC_ALLOCATOR);
if (json_document.capacity() == 0) { if (json_document.overflowed()) {
ESP_LOGE(TAG, "Could not allocate memory for JSON document!"); ESP_LOGE(TAG, "Could not allocate memory for JSON document!");
return "{}"; return "{}";
} }
@@ -60,8 +59,9 @@ bool parse_json(const std::string &data, const json_parse_t &f) {
// as we can not have a true dynamic sized document. // as we can not have a true dynamic sized document.
// The excess memory is freed below with `shrinkToFit()` // The excess memory is freed below with `shrinkToFit()`
while (true) { while (true) {
DynamicJsonDocument json_document(request_size); auto DOC_ALLOCATOR = SpiRamAllocator();
if (json_document.capacity() == 0) { JsonDocument json_document(&DOC_ALLOCATOR);
if (json_document.overflowed()) {
ESP_LOGE(TAG, "Could not allocate memory for JSON document!"); ESP_LOGE(TAG, "Could not allocate memory for JSON document!");
return false; return false;
} }