Merge pull request letscontrolit#5233 from TD-er/bugfix/memory_alloca…

…tion_strings [Memory] Allow use of PSRAM + free unused strings
TD-er · Jan 28, 2025 · 6a95d04 · 6a95d04
2 parents b6b981d + e49ef52
commit 6a95d04
Show file tree

Hide file tree

Showing 38 changed files with 174 additions and 79 deletions.
diff --git a/src/_C008.cpp b/src/_C008.cpp
@@ -49,7 +49,7 @@ bool CPlugin_008(CPlugin::Function function, struct EventStruct *event, String&
 
     case CPlugin::Function::CPLUGIN_PROTOCOL_TEMPLATE:
     {
-      event->String1 = String();
+      free_string(event->String1);
       event->String2 = F("demo.php?name=%sysname%&task=%tskname%&valuename=%valname%&value=%value%");
       break;
     }

diff --git a/src/_C010.cpp b/src/_C010.cpp
@@ -35,7 +35,7 @@ bool CPlugin_010(CPlugin::Function function, struct EventStruct *event, String&
 
     case CPlugin::Function::CPLUGIN_PROTOCOL_TEMPLATE:
     {
-      event->String1 = String();
+      free_string(event->String1);
       event->String2 = F("%sysname%_%tskname%_%valname%=%value%");
       break;
     }

diff --git a/src/_C015.cpp b/src/_C015.cpp
@@ -202,7 +202,7 @@ bool CPlugin_015(CPlugin::Function function, struct EventStruct *event, String&
 
           if (!isvalid) {
             // send empty string to Blynk in case of error
-            formattedValue = String();
+            free_string(formattedValue);
           }
 
           const String valueName = Cache.getTaskDeviceValueName(event->TaskIndex, x);

diff --git a/src/_C016.cpp b/src/_C016.cpp
@@ -104,8 +104,8 @@ bool CPlugin_016(CPlugin::Function function, struct EventStruct *event, String&
 
     case CPlugin::Function::CPLUGIN_PROTOCOL_TEMPLATE:
     {
-      event->String1 = String();
-      event->String2 = String();
+      free_string(event->String1);
+      free_string(event->String2);
       break;
     }
 

diff --git a/src/_P055_Chiming.ino b/src/_P055_Chiming.ino
@@ -529,7 +529,7 @@ uint8_t Plugin_055_ReadChime(const String& name, String& tokens)
     log = strformat(F("Chime: read %s "), fileName.c_str());
   }
 
-  tokens = String();
+  free_string(tokens);
   fs::File f = tryOpenFile(fileName, "r");
 
   if (f)

diff --git a/src/src/Commands/InternalCommands.cpp b/src/src/Commands/InternalCommands.cpp
@@ -173,7 +173,7 @@ bool do_command_case_check(command_case_data         & data,
   // The data struct is re-used on each attempt to process an internal command.
   // Re-initialize the only two members that may have been altered by a previous call.
   data.retval = false;
-  data.status = String();
+  free_string(data.status);
 
   if (!checkSourceFlags(data.event->Source, group)) {
     data.status = return_incorrect_source();

diff --git a/src/src/Controller_struct/C018_data_struct.cpp b/src/src/Controller_struct/C018_data_struct.cpp
@@ -25,9 +25,9 @@ void C018_data_struct::reset() {
     delete C018_easySerial;
     C018_easySerial = nullptr;
   }
-  cacheDevAddr     = String();
-  cacheHWEUI       = String();
-  cacheSysVer      = String();
+  free_string(cacheDevAddr);
+  free_string(cacheHWEUI);
+  free_string(cacheSysVer);
   autobaud_success = false;
 }
 
@@ -157,7 +157,7 @@ bool C018_data_struct::initOTAA(const String& AppEUI, const String& AppKey, cons
   if (myLora == nullptr) { return false; }
   bool success = myLora->initOTAA(AppEUI, AppKey, DevEUI);
 
-  cacheDevAddr = String();
+  free_string(cacheDevAddr);
 
   C018_logError(F("initOTAA()"));
   updateCacheOnInit();
@@ -334,7 +334,7 @@ void C018_data_struct::updateCacheOnInit() {
       cacheDevAddr = myLora->sendRawCommand(F("mac get devaddr"));
 
       if (cacheDevAddr == F("00000000")) {
-        cacheDevAddr = String();
+        free_string(cacheDevAddr);
       }
     }
   }

diff --git a/src/src/DataStructs/EventQueue.cpp b/src/src/DataStructs/EventQueue.cpp
@@ -11,18 +11,21 @@
 void EventQueueStruct::add(const String& event, bool deduplicate)
 {
   if (!deduplicate || !isDuplicate(event)) {
-    #ifdef USE_SECOND_HEAP
+#if defined(USE_SECOND_HEAP) || defined(ESP32)
     String tmp;
     reserve_special(tmp, event.length());
     tmp = event;
 
+#ifdef USE_SECOND_HEAP
     // Do not add to the list while on 2nd heap
     HeapSelectDram ephemeral;
+#endif
+
 
     _eventQueue.emplace_back(std::move(tmp));
-    #else
+#else
     _eventQueue.push_back(event);
-    #endif // ifdef USE_SECOND_HEAP
+#endif
   }
 }
 
@@ -38,12 +41,14 @@ void EventQueueStruct::addMove(String&& event, bool deduplicate)
   if (!event.length()) { return; }
 
   if (!deduplicate || !isDuplicate(event)) {
-    #ifdef USE_SECOND_HEAP
+    #if defined(USE_SECOND_HEAP) || defined(ESP32)
     String tmp;
     move_special(tmp, std::move(event));
 
+    #ifdef USE_SECOND_HEAP
     // Do not add to the list while on 2nd heap
     HeapSelectDram ephemeral;
+    #endif
     _eventQueue.emplace_back(std::move(tmp));
     #else
     _eventQueue.emplace_back(std::move(event));

diff --git a/src/src/DataStructs/ExtendedControllerCredentialsStruct.cpp b/src/src/DataStructs/ExtendedControllerCredentialsStruct.cpp
@@ -1,6 +1,7 @@
 #include "../DataStructs/ExtendedControllerCredentialsStruct.h"
 
 #include "../Helpers/ESPEasy_Storage.h"
+#include "../Helpers/StringConverter.h"
 
 #define EXT_CONTR_CRED_USER_OFFSET 0
 #define EXT_CONTR_CRED_PASS_OFFSET 1
@@ -24,7 +25,7 @@ bool ExtendedControllerCredentialsStruct::validateChecksum() const
 
 void ExtendedControllerCredentialsStruct::clear() {
   for (size_t i = 0; i < CONTROLLER_MAX * 2; ++i) {
-    _strings[i] = String();
+    free_string(_strings[i]);
   }
 }
 

diff --git a/src/src/DataStructs/LogEntry.cpp b/src/src/DataStructs/LogEntry.cpp
@@ -26,8 +26,9 @@ bool LogEntry_t::add(const uint8_t loglevel, const String& line)
     #endif // ifdef USE_SECOND_HEAP
 
     if (line.length() > LOG_STRUCT_MESSAGE_SIZE - 1) {
-      _message = std::move(line.substring(0, LOG_STRUCT_MESSAGE_SIZE - 1));
+      move_special(_message, line.substring(0, LOG_STRUCT_MESSAGE_SIZE - 1));
     } else {
+      reserve_special(_message, line.length());
       _message = line;
     }
   }
@@ -48,7 +49,7 @@ bool LogEntry_t::add(const uint8_t loglevel, String&& line)
     // Need to make a substring, which is a new allocation, on the 2nd heap
     HeapSelectIram ephemeral;
       #endif // ifdef USE_SECOND_HEAP
-    _message = std::move(line.substring(0, LOG_STRUCT_MESSAGE_SIZE - 1));
+    move_special(_message, line.substring(0, LOG_STRUCT_MESSAGE_SIZE - 1));
   } else {
     move_special(_message, std::move(line));
   }
@@ -59,7 +60,7 @@ bool LogEntry_t::add(const uint8_t loglevel, String&& line)
 
 void LogEntry_t::clear()
 {
-  _message   = String();
+  free_string(_message);
   _timestamp = 0;
   _loglevel  = 0;
 }

diff --git a/src/src/DataStructs/LogStruct.h b/src/src/DataStructs/LogStruct.h
@@ -10,7 +10,7 @@
  * LogStruct
 \*********************************************************************************************/
 #ifdef ESP32
-  #define LOG_STRUCT_MESSAGE_LINES 60
+  #define LOG_STRUCT_MESSAGE_LINES 120
 #else
   #ifdef USE_SECOND_HEAP
     #define LOG_STRUCT_MESSAGE_LINES 60

diff --git a/src/src/DataStructs/Modbus.cpp b/src/src/DataStructs/Modbus.cpp
@@ -4,6 +4,7 @@
 
 #include "../DataStructs/ControllerSettingsStruct.h"
 #include "../ESPEasyCore/ESPEasy_Log.h"
+#include "../Helpers/StringConverter.h"
 
 
 Modbus::Modbus() : ModbusClient(nullptr), errcnt(0), timeout(0),
@@ -108,7 +109,7 @@ bool Modbus::handle() {
   unsigned int RXavailable = 0;
 
   #ifndef BUILD_NO_DEBUG
-  LogString = String();
+  free_string(LogString);
   #endif
   int64_t rxValue = 0;
 

diff --git a/src/src/DataStructs/RulesEventCache.cpp b/src/src/DataStructs/RulesEventCache.cpp
@@ -41,6 +41,10 @@ bool RulesEventCache::addLine(const String& line, const String& filename, size_t
     # ifdef USE_SECOND_HEAP
     HeapSelectDram ephemeral;
     # endif // ifdef USE_SECOND_HEAP
+    #ifdef ESP32
+    reserve_special(event, event.length());
+    reserve_special(action, action.length());
+    #endif
 
     _eventCache.emplace_back(filename, pos, std::move(event), std::move(action));
     return true;

diff --git a/src/src/DataStructs/Web_StreamingBuffer.cpp b/src/src/DataStructs/Web_StreamingBuffer.cpp
@@ -336,7 +336,7 @@ void Web_StreamingBuffer::sendContentBlocking(String& data) {
   web_server.sendContent(data);
 
   if (data.length() > (CHUNKED_BUFFER_SIZE + 1)) {
-    data = String(); // Clear also allocated memory
+    free_string(data); // Clear also allocated memory
   } else {
     data.clear();
   }

diff --git a/src/src/ESPEasyCore/ESPEasy_Log.cpp b/src/src/ESPEasyCore/ESPEasy_Log.cpp
@@ -17,6 +17,8 @@
 #include "../Helpers/ESPEasy_Storage.h"
 #endif
 
+#define UPDATE_LOGLEVEL_ACTIVE_CACHE_INTERVAL 5000
+
 /********************************************************************************************\
   Init critical variables for logging (important during initial factory reset stuff )
   \*********************************************************************************************/
@@ -124,6 +126,13 @@ bool loglevelActiveFor(uint8_t logLevel) {
     return false;
   }
   #endif
+  static uint32_t lastUpdateLogLevelCache = 0;
+  if (lastUpdateLogLevelCache == 0 || 
+      timePassedSince(lastUpdateLogLevelCache) > UPDATE_LOGLEVEL_ACTIVE_CACHE_INTERVAL)
+  {
+    lastUpdateLogLevelCache = millis();
+    updateLogLevelCache();
+  }
   return logLevel <= highest_active_log_level;
 }
 
@@ -143,15 +152,13 @@ uint8_t getSerialLogLevel() {
 }
 
 uint8_t getWebLogLevel() {
-  uint8_t logLevelSettings = 0;
   if (Logging.logActiveRead()) {
-    logLevelSettings = Settings.WebLogLevel;
-  } else {
-    if (Settings.WebLogLevel != 0) {
-      updateLogLevelCache();
-    }
+    return Settings.WebLogLevel;
+  } 
+  if (Settings.WebLogLevel != LOG_LEVEL_NONE) {
+    updateLogLevelCache();
   }
-  return logLevelSettings;
+  return LOG_LEVEL_NONE;
 }
 
 bool loglevelActiveFor(uint8_t destination, uint8_t logLevel) {
@@ -245,7 +252,7 @@ void addLog(uint8_t logLevel, const char *line)
       }
     }
     #else 
-    if (!copy.reserve(strlen_P((PGM_P)line))) {
+    if (!reserve_special(copy, strlen_P((PGM_P)line))) {
       return;
     }
     copy = line;
@@ -353,5 +360,5 @@ void addToLogMove(uint8_t logLevel, String&& string)
     Logging.add(logLevel, std::move(string));
   }
   // Make sure the string may no longer keep up memory
-  string = String();
+  free_string(string);
 }
diff --git a/src/src/Globals/RamTracker.cpp b/src/src/Globals/RamTracker.cpp
@@ -156,7 +156,7 @@ RamTracker::RamTracker(void) {
   writePtr = 0;
 
   for (int i = 0; i < TRACES; i++) {
-    traces[i] = String();
+    free_string(traces[i]);
     tracesMemory[i] = 0xffffffff; // init with best case memory values, so they get replaced if memory goes lower
   }
 
@@ -172,7 +172,7 @@ void RamTracker::registerRamState(const String& s) {   // store function
   int bestCase = bestCaseTrace();                      // find best case memory trace
 
   if (ESP.getFreeHeap() < tracesMemory[bestCase]) {    // compare to current memory value
-    traces[bestCase] = String();
+    free_string(traces[bestCase]);
     readPtr          = writePtr + 1;                   // read out buffer, oldest value first
 
     if (readPtr >= TRACEENTRIES) { 
@@ -210,7 +210,7 @@ void RamTracker::getTraceBuffer() {
       retval += ' ';
       retval += traces[i];
       addLogMove(LOG_LEVEL_DEBUG_DEV, retval);
-      retval = String();
+      retval.clear();
     }
   }
 #endif // ifndef BUILD_NO_DEBUG

diff --git a/src/src/Helpers/Audio.cpp b/src/src/Helpers/Audio.cpp
@@ -5,6 +5,7 @@
 #include "../Globals/RamTracker.h"
 #include "../Helpers/Hardware_GPIO.h"
 #include "../Helpers/Hardware_PWM.h"
+#include "../Helpers/StringConverter.h"
 
 
 /********************************************************************************************\
@@ -53,7 +54,7 @@ void clear_rtttl_melody() {
     #   endif // if FEATURE_RTTTL_EVENTS
   }
 
-  rtttlMelody = String();
+  free_string(rtttlMelody);
 }
 
 void set_rtttl_melody(String& melody) {

diff --git a/src/src/Helpers/ESPEasy_checks.cpp b/src/src/Helpers/ESPEasy_checks.cpp
@@ -211,7 +211,7 @@ String ReportOffsetErrorInStruct(const String& structname, size_t offset) {
 *  Not a member function to be able to use the F-macro
 \*********************************************************************************************/
 bool SettingsCheck(String& error) {
-  error = String();
+  free_string(error);
   #ifndef LIMIT_BUILD_SIZE
 #ifdef esp8266
   size_t offset = offsetof(SettingsStruct, ResetFactoryDefaultPreference);