From 2849399d5470bcd9646bf6a4f0f861e3029a5135 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Tue, 26 Sep 2023 10:18:33 +1000 Subject: [PATCH] Force large c++ arrays into PSRAM This is mostly targetted at leveldb_ which is rude and does not support custom allocators --- src/util/CMakeLists.txt | 1 + src/util/allocator.cpp | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 src/util/allocator.cpp diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index 0903a912..913512a2 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -3,5 +3,6 @@ # SPDX-License-Identifier: GPL-3.0-only idf_component_register( + SRCS "allocator.cpp" INCLUDE_DIRS "include" REQUIRES "database") diff --git a/src/util/allocator.cpp b/src/util/allocator.cpp new file mode 100644 index 00000000..d505ab3e --- /dev/null +++ b/src/util/allocator.cpp @@ -0,0 +1,29 @@ +/* + * Copyright 2023 jacqueline + * + * SPDX-License-Identifier: GPL-3.0-only + */ + +#include + +#include "esp_heap_caps.h" + +void* operator new[](std::size_t sz) { + if (sz == 0) { + ++sz; // avoid std::malloc(0) which may return nullptr on success + } + + if (sz > 256) { + return heap_caps_malloc(sz, MALLOC_CAP_SPIRAM); + } + + return heap_caps_malloc(sz, MALLOC_CAP_DEFAULT); +} + +void operator delete[](void* ptr) noexcept { + heap_caps_free(ptr); +} + +void operator delete[](void* ptr, std::size_t size) noexcept { + heap_caps_free(ptr); +} \ No newline at end of file