From a83f067af9af82f034596f6f6154f4dccf598ace Mon Sep 17 00:00:00 2001 From: JF Date: Thu, 2 Jul 2020 21:38:52 +0200 Subject: Reduce RAM memory usage by tuning the stack of the stasks and the heap allocated for FreeRTOS. Add Monitor to log the stack usage of each task. --- src/SystemTask/SystemMonitor.h | 46 ++++++++++++++++++++++++++++++++++++++++++ src/SystemTask/SystemTask.cpp | 2 ++ src/SystemTask/SystemTask.h | 7 +++++++ 3 files changed, 55 insertions(+) create mode 100644 src/SystemTask/SystemMonitor.h (limited to 'src/SystemTask') diff --git a/src/SystemTask/SystemMonitor.h b/src/SystemTask/SystemMonitor.h new file mode 100644 index 00000000..50dd295a --- /dev/null +++ b/src/SystemTask/SystemMonitor.h @@ -0,0 +1,46 @@ +#pragma once +#include +#include +#include + + +namespace Pinetime { + namespace System { + struct DummyMonitor {}; + struct FreeRtosMonitor {}; + + template + class SystemMonitor { + public: + SystemMonitor() = delete; + }; + + template<> + class SystemMonitor { + public: + void Process() const {} + }; + + template<> + class SystemMonitor { + public: + void Process() const { + if(xTaskGetTickCount() - lastTick > 10000) { + NRF_LOG_INFO("---------------------------------------\nFee heap : %d", xPortGetFreeHeapSize()); + auto nb = uxTaskGetSystemState(tasksStatus, 10, NULL); + for (int i = 0; i < nb; i++) { + NRF_LOG_INFO("Task [%s] - %d", tasksStatus[i].pcTaskName, tasksStatus[i].usStackHighWaterMark); + if (tasksStatus[i].usStackHighWaterMark < 20) + NRF_LOG_INFO("WARNING!!! Task %s task is nearly full, only %dB available", tasksStatus[i].pcTaskName, + tasksStatus[i].usStackHighWaterMark * 4); + } + lastTick = xTaskGetTickCount(); + } + } + + private: + mutable TickType_t lastTick = 0; + mutable TaskStatus_t tasksStatus[10]; + }; + } +} \ No newline at end of file diff --git a/src/SystemTask/SystemTask.cpp b/src/SystemTask/SystemTask.cpp index 61b3c638..1f01b1b5 100644 --- a/src/SystemTask/SystemTask.cpp +++ b/src/SystemTask/SystemTask.cpp @@ -169,6 +169,8 @@ void SystemTask::Work() { dateTimeController.UpdateTime(systick_counter); batteryController.Update(); + monitor.Process(); + if(!nrf_gpio_pin_read(pinButton)) watchdog.Kick(); } diff --git a/src/SystemTask/SystemTask.h b/src/SystemTask/SystemTask.h index ab5f7010..e006058f 100644 --- a/src/SystemTask/SystemTask.h +++ b/src/SystemTask/SystemTask.h @@ -10,6 +10,7 @@ #include #include #include +#include "SystemMonitor.h" namespace Pinetime { namespace System { @@ -72,6 +73,12 @@ namespace Pinetime { bool doNotGoToSleep = false; void GoToRunning(); + +#if configUSE_TRACE_FACILITY == 1 + SystemMonitor monitor; +#else + SystemMonitor monitor; +#endif }; } } \ No newline at end of file -- cgit v1.2.3-70-g09d2