-
-
Notifications
You must be signed in to change notification settings - Fork 959
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SystemMonitor: implement FreeRtosMonitor only if trace facility is set
Split SystemMonitor into h and cpp file and move the logging code of the `Process` function into the cpp file. Depending of the `configUSE_TRACE_FACILITY` define from `src/FreeRTOSConfig.h` create either a "FreeRtosMonitor" or a "DummyMonitor". Make the `Process()` function non-const, as the FreeRtosMonitor changes the member variable `lastTick`. In `SystemTask.h` we then only need to use `SystemMonitor`, without knowledge of the `configUSE_TRACE_FACILITY` define.
- Loading branch information
1 parent
5fe5cee
commit 187d99c
Showing
4 changed files
with
35 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
#include "systemtask/SystemTask.h" | ||
#if configUSE_TRACE_FACILITY == 1 | ||
// FreeRtosMonitor | ||
#include <FreeRTOS.h> | ||
#include <task.h> | ||
#include <nrf_log.h> | ||
|
||
void Pinetime::System::SystemMonitor::Process() { | ||
if (xTaskGetTickCount() - lastTick > 10000) { | ||
NRF_LOG_INFO("---------------------------------------\nFree heap : %d", xPortGetFreeHeapSize()); | ||
TaskStatus_t tasksStatus[10]; | ||
auto nb = uxTaskGetSystemState(tasksStatus, 10, nullptr); | ||
for (uint32_t 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(); | ||
} | ||
} | ||
#else | ||
// DummyMonitor | ||
void Pinetime::System::SystemMonitor::Process() {} | ||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,44 +1,16 @@ | ||
#pragma once | ||
#include <FreeRTOS.h> | ||
#include <FreeRTOS.h> // declares configUSE_TRACE_FACILITY | ||
#include <task.h> | ||
#include <nrf_log.h> | ||
|
||
namespace Pinetime { | ||
namespace System { | ||
struct DummyMonitor {}; | ||
struct FreeRtosMonitor {}; | ||
|
||
template <class T> class SystemMonitor { | ||
public: | ||
SystemMonitor() = delete; | ||
}; | ||
|
||
template <> class SystemMonitor<DummyMonitor> { | ||
class SystemMonitor { | ||
public: | ||
void Process() const { | ||
} | ||
}; | ||
|
||
template <> class SystemMonitor<FreeRtosMonitor> { | ||
public: | ||
void Process() const { | ||
if (xTaskGetTickCount() - lastTick > 10000) { | ||
NRF_LOG_INFO("---------------------------------------\nFree heap : %d", xPortGetFreeHeapSize()); | ||
auto nb = uxTaskGetSystemState(tasksStatus, 10, nullptr); | ||
for (uint32_t 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(); | ||
} | ||
} | ||
|
||
void Process(); | ||
#if configUSE_TRACE_FACILITY == 1 | ||
private: | ||
mutable TickType_t lastTick = 0; | ||
mutable TaskStatus_t tasksStatus[10]; | ||
#endif | ||
}; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters