Valentin V. Bartenev
72fc497980
Replace the two separate volatile counters (s_idle_ticks, s_busy_ticks) with a two-element array s_ticks[2]: [0] = idle ticks (xTaskGetCurrentTaskHandle() != s_idle_handle → false → 0) [1] = busy ticks (xTaskGetCurrentTaskHandle() != s_idle_handle → true → 1) The tick hook becomes a single branchless statement: s_ticks[xTaskGetCurrentTaskHandle() != s_idle_handle]++; This eliminates the conditional branch from the tick ISR at the cost of a few additional instructions in IRAM. On Xtensa LX7 the branch is somewhat unpredictable — the system alternates between idle and busy — so removing the misprediction penalty (~5–10 cycles/call) outweighs the slightly larger code size. _onSample() is updated to read s_ticks[0] (idle) and s_ticks[1] (busy) accordingly. All other logic is unchanged.
49 строки
1.4 KiB
C++
49 строки
1.4 KiB
C++
#ifdef ESP32
|
|
#include "CPUUsageTracker.h"
|
|
#include "esp_freertos_hooks.h"
|
|
|
|
volatile uint32_t CPUUsageTracker::s_ticks[2] = {0, 0};
|
|
TaskHandle_t CPUUsageTracker::s_idle_handle = nullptr;
|
|
|
|
void IRAM_ATTR CPUUsageTracker::s_tick_hook() {
|
|
s_ticks[xTaskGetCurrentTaskHandle() != s_idle_handle]++;
|
|
}
|
|
|
|
void CPUUsageTracker::s_sample_cb(void* arg) {
|
|
static_cast<CPUUsageTracker*>(arg)->_onSample();
|
|
}
|
|
|
|
void CPUUsageTracker::_onSample() {
|
|
const uint32_t idle = s_ticks[0];
|
|
const uint32_t busy = s_ticks[1];
|
|
const uint32_t di = idle - _last_idle;
|
|
const uint32_t db = busy - _last_busy;
|
|
_last_idle = idle;
|
|
_last_busy = busy;
|
|
|
|
const uint32_t total = di + db;
|
|
const float sample = (total > 0) ? (float)db / (float)total : 0.0f;
|
|
|
|
const uint8_t s8 = (uint8_t)(sample * 255.0f + 0.5f);
|
|
const uint16_t last = _sma_buf[_sma_idx];
|
|
_sma_buf[_sma_idx] = s8;
|
|
_sma_sum = (_sma_sum - last) + s8;
|
|
_sma_idx = (_sma_idx + 1) & (SMA_WINDOW - 1);
|
|
}
|
|
|
|
void CPUUsageTracker::begin() {
|
|
s_idle_handle = xTaskGetIdleTaskHandleForCPU(0);
|
|
esp_register_freertos_tick_hook_for_cpu(s_tick_hook, 0);
|
|
|
|
esp_timer_create_args_t args = {
|
|
.callback = s_sample_cb,
|
|
.arg = this,
|
|
.dispatch_method = ESP_TIMER_TASK,
|
|
.name = "cpu_sample"
|
|
};
|
|
esp_timer_create(&args, &_timer);
|
|
esp_timer_start_periodic(_timer, 60000000ULL / SMA_WINDOW); // SMA_WINDOW samples per minute
|
|
}
|
|
|
|
#endif
|