add d_malloc_only() for AsyncJSON

major stability improvement, especially on classic esp32.
This commit is contained in:
Frank
2026-02-20 01:09:52 +01:00
parent 8680d13df4
commit e519b4190b
3 changed files with 22 additions and 2 deletions

View File

@@ -17,6 +17,8 @@
// global WLED memory functions (util.cpp) // global WLED memory functions (util.cpp)
extern "C" { extern "C" {
// only allocate from internal DRAM, never uses PSRAM
void *d_malloc_only(size_t);
// prefer DRAM in d_xalloc functions, PSRAM as fallback // prefer DRAM in d_xalloc functions, PSRAM as fallback
void *d_malloc(size_t); void *d_malloc(size_t);
void *d_calloc(size_t, size_t); void *d_calloc(size_t, size_t);
@@ -168,8 +170,9 @@ public:
if (_onRequest) { if (_onRequest) {
_contentLength = total; _contentLength = total;
if (total > 0 && request->_tempObject == NULL && (int)total < _maxContentLength) { if (total > 0 && request->_tempObject == NULL && (int)total < _maxContentLength) {
//request->_tempObject = malloc(total);
//request->_tempObject = d_malloc(total); // seems to cause instabilities on classic esp32 with PSRAM //request->_tempObject = d_malloc(total); // seems to cause instabilities on classic esp32 with PSRAM
request->_tempObject = malloc(total); request->_tempObject = d_malloc_only(total);
} }
if (request->_tempObject != NULL) { if (request->_tempObject != NULL) {
memcpy((uint8_t*)(request->_tempObject) + index, data, len); memcpy((uint8_t*)(request->_tempObject) + index, data, len);

View File

@@ -732,6 +732,10 @@ void *d_malloc(size_t size) {
return validateFreeHeap(buffer); return validateFreeHeap(buffer);
} }
void *d_malloc_only(size_t size) {
return d_malloc(size);
}
void *d_calloc(size_t count, size_t size) { void *d_calloc(size_t count, size_t size) {
void *buffer = calloc(count, size); void *buffer = calloc(count, size);
return validateFreeHeap(buffer); return validateFreeHeap(buffer);
@@ -802,7 +806,7 @@ static inline bool isOkForDRAMHeap(size_t amount) {
size_t avail = d_measureContiguousFreeHeap(); size_t avail = d_measureContiguousFreeHeap();
if ((amount < avail) && (avail - amount > MIN_HEAP_SIZE)) return true; if ((amount < avail) && (avail - amount > MIN_HEAP_SIZE)) return true;
else { else {
DEBUG_PRINTF("* isOkForDRAMHeap() DRAM allocation rejected (%u bytes requested, %u available) !\n", amount, avail); USER_PRINTF("* isOkForDRAMHeap() DRAM allocation rejected (%u bytes requested, %u-%u available).\n", amount, avail, MIN_HEAP_SIZE);
return(false); return(false);
} }
#else #else
@@ -859,6 +863,17 @@ void *d_malloc(size_t size) {
return buffer; return buffer;
} }
void *d_malloc_only(size_t size) {
// variant of d_malloc that only allocates from "internal" DRAM (no PSRAM fallback)
void *buffer = nullptr;
if (isOkForDRAMHeap(size)) // no RTC RAM allocation allowed, always request DRAM
buffer = heap_caps_malloc(size, MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
buffer = validateFreeHeap(buffer); // make sure there is enough free heap left
if (!buffer) { USER_PRINTF("* d_malloc_only() failed (%u bytes) !\n", size); }
return buffer;
}
void *d_calloc(size_t count, size_t size) { void *d_calloc(size_t count, size_t size) {
// similar to d_malloc but uses heap_caps_calloc // similar to d_malloc but uses heap_caps_calloc
void *buffer = nullptr; void *buffer = nullptr;

View File

@@ -88,6 +88,8 @@ inline uint8_t hw_random8(uint32_t lowerlimit, uint32_t upperlimit) { uint32_t r
// memory allocation wrappers (util.cpp) // memory allocation wrappers (util.cpp)
extern "C" { extern "C" {
// only allocate from internal DRAM, never uses PSRAM
void *d_malloc_only(size_t);
// prefer DRAM in d_xalloc functions, PSRAM as fallback // prefer DRAM in d_xalloc functions, PSRAM as fallback
void *d_malloc(size_t); void *d_malloc(size_t);
void *d_calloc(size_t, size_t); void *d_calloc(size_t, size_t);