github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-10-14 10:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[core] Do not search the same heap twice in RAMAllocator single-region requests (#19381)

Browse Source
This commit is contained in:
J. Nick Koston
2026-10-11 16:24:36 -10:00
committed by GitHub
parent 650a02beb0
commit 40606a6c08
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/core/helpers.h
+15 -6
View File
@@ -2214,7 +2214,7 @@ template<class T> class RAMAllocator {
T *ptr = nullptr;
#ifdef USE_ESP32
const auto caps = this->get_caps_();
ptr = static_cast<T *>(heap_caps_malloc_prefer(size, 2, caps[0], caps[1]));
ptr = static_cast<T *>(heap_caps_malloc_prefer(size, caps.num, caps.primary, caps.fallback));
#else
// Ignore ALLOC_EXTERNAL/ALLOC_INTERNAL flags if external allocation is not supported
ptr = static_cast<T *>(malloc(size)); // NOLINT(cppcoreguidelines-owning-memory,cppcoreguidelines-no-malloc)
@@ -2229,7 +2229,7 @@ template<class T> class RAMAllocator {
T *ptr = nullptr;
#ifdef USE_ESP32
const auto caps = this->get_caps_();
ptr = static_cast<T *>(heap_caps_realloc_prefer(p, size, 2, caps[0], caps[1]));
ptr = static_cast<T *>(heap_caps_realloc_prefer(p, size, caps.num, caps.primary, caps.fallback));
#else
// Ignore ALLOC_EXTERNAL/ALLOC_INTERNAL flags if external allocation is not supported
ptr = static_cast<T *>(realloc(p, size)); // NOLINT(cppcoreguidelines-owning-memory,cppcoreguidelines-no-malloc)
@@ -2301,12 +2301,21 @@ template<class T> class RAMAllocator {
private:
#ifdef USE_ESP32
/// Returns {primary_caps, fallback_caps} for heap_caps_*_prefer based on the configured flags.
struct Caps {
uint32_t primary;
uint32_t fallback;
uint8_t num; // distinct capability sets to hand to heap_caps_*_prefer
constexpr Caps(uint32_t primary_caps, uint32_t fallback_caps)
: primary(primary_caps), fallback(fallback_caps), num(primary_caps == fallback_caps ? 1 : 2) {}
};
/// Returns the capability sets for heap_caps_*_prefer based on the configured flags.
/// PREFER_INTERNAL implies both regions are enabled (enforced by the constructor), so when it is set
/// the primary is internal and the fallback is external. Otherwise the primary is whichever region
/// is enabled (external preferred when both are enabled), and the fallback is the other region (or
/// the same region when only one is enabled, making the second attempt a no-op).
std::array<uint32_t, 2> get_caps_() const {
/// is enabled (external preferred when both are enabled), and the fallback is the other region (or the
/// same region when only one is enabled). With a single region enabled num is 1, so the duplicate
/// fallback is never searched.
constexpr Caps get_caps_() const {
constexpr uint32_t external_caps = MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT;
constexpr uint32_t internal_caps = MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT;
if (this->flags_ & PREFER_INTERNAL) {