added memory profiling #632

emsesp · Dec 15, 2020 · 06be035 · 06be035
1 parent 4087a4f
commit 06be035
Show file tree

Hide file tree

Showing 7 changed files with 164 additions and 113 deletions.
diff --git a/lib/uuid-console/src/uuid/console.h b/lib/uuid-console/src/uuid/console.h
@@ -892,7 +892,7 @@ class Shell : public std::enable_shared_from_this<Shell>, public uuid::log::Hand
 	 * @since 0.1.0
 	 */
     size_t vprintf(const __FlashStringHelper * format, va_list ap);
-    void set_command_str(const __FlashStringHelper * str);
+    void   set_command_str(const __FlashStringHelper * str);
 
     static const uuid::log::Logger          logger_; /*!< uuid::log::Logger instance for shells. @since 0.1.0 */
     static std::set<std::shared_ptr<Shell>> shells_; /*!< Registered running shells to be executed. @since 0.1.0 */

diff --git a/src/console.cpp b/src/console.cpp
@@ -487,11 +487,9 @@ void Console::load_standard_commands(unsigned int context) {
                                                Test::run_test(shell, arguments.front());
                                            }
                                        });
-#if defined(EMSESP_STANDALONE)
     EMSESPShell::commands->add_command(context, CommandFlags::USER, flash_string_vector{F("t")}, [](Shell & shell, const std::vector<std::string> & arguments) {
         Test::run_test(shell, "default");
     });
-#endif
 #endif
 
     EMSESPShell::commands->add_command(

diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp
diff --git a/src/emsdevice.h b/src/emsdevice.h
@@ -351,6 +351,10 @@ class EMSdevice {
     };
     const std::vector<DeviceValue> devicevalues() const;
 
+    void init_devicevalues(uint8_t size) {
+        devicevalues_.reserve(size);
+    }
+
   private:
     uint8_t     unique_id_;
     uint8_t     device_type_ = DeviceType::SYSTEM;

diff --git a/src/emsesp.cpp b/src/emsesp.cpp
@@ -758,6 +758,24 @@ void EMSESP::show_devices(uuid::console::Shell & shell) {
                 emsdevice->show_telegram_handlers(shell);
                 // emsdevice->show_mqtt_handlers(shell);
                 shell.println();
+
+#if defined(EMSESP_DEBUG)
+                // TODO debug stuff - count size of objects
+                size_t  total_s = 0;
+                uint8_t count   = 0;
+                for (const auto & dv : emsdevice->devicevalues()) {
+                    size_t s = sizeof(dv);
+                    if (dv.full_name) {
+                        shell.printfln("[%s] %d", uuid::read_flash_string(dv.full_name).c_str(), s);
+                    } else {
+                        shell.printfln("[%s]* %d", uuid::read_flash_string(dv.short_name).c_str(), s);
+                    }
+                    total_s += s;
+                    count++;
+                }
+                shell.printfln("Total size of %d elements: %d", count, total_s);
+                shell.println();
+#endif
             }
         }
     }
@@ -785,7 +803,7 @@ bool EMSESP::add_device(const uint8_t device_id, const uint8_t product_id, std::
                 // find the name and flags in our database
                 for (const auto & device : device_library_) {
                     if (device.product_id == product_id) {
-                        emsdevice->name(uuid::read_flash_string(device.name));
+                        emsdevice->name(std::move(uuid::read_flash_string(device.name)));
                         emsdevice->add_flags(device.flags);
                     }
                 }

diff --git a/src/system.cpp b/src/system.cpp
@@ -192,6 +192,10 @@ void System::start() {
 #endif
     }
 
+#if defined(EMSESP_DEBUG)
+    show_mem("Startup");
+#endif
+
     // print boot message
     EMSESP::esp8266React.getWiFiSettingsService()->read(
         [&](WiFiSettings & wifiSettings) { LOG_INFO(F("System %s booted (EMS-ESP version %s)"), wifiSettings.hostname.c_str(), EMSESP_APP_VERSION); });
@@ -300,7 +304,19 @@ void System::loop() {
 void System::show_mem(const char * note) {
 #if defined(ESP8266)
 #if defined(EMSESP_DEBUG)
-    LOG_INFO(F("(%s) Free heap: %d%% (%lu), frag:%u%%"), note, free_mem(), (unsigned long)ESP.getFreeHeap(), ESP.getHeapFragmentation());
+    static uint32_t old_free_heap = 0;
+    static uint8_t  old_heap_frag = 0;
+    uint32_t        free_heap     = ESP.getFreeHeap();
+    uint8_t         heap_frag     = ESP.getHeapFragmentation();
+    LOG_INFO(F("(%s) Free heap: %d%% (%lu) (~%lu), frag:%d%% (~%d)"),
+             note,
+             free_mem(),
+             free_heap,
+             (uint32_t)abs(free_heap - old_free_heap),
+             heap_frag,
+             (uint8_t)abs(heap_frag - old_heap_frag));
+    old_free_heap = free_heap;
+    old_heap_frag = heap_frag;
 #endif
 #endif
 }

diff --git a/src/test/test.h b/src/test/test.h
@@ -43,8 +43,8 @@ namespace emsesp {
 // #define EMSESP_TEST_DEFAULT "solar"
 // #define EMSESP_TEST_DEFAULT "mixer"
 // #define EMSESP_TEST_DEFAULT "web"
-#define EMSESP_TEST_DEFAULT "general"
-// #define EMSESP_TEST_DEFAULT "boiler"
+// #define EMSESP_TEST_DEFAULT "general"
+#define EMSESP_TEST_DEFAULT "boiler"
 
 class Test {
   public: