github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-19 11:08:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[core] Reduce runtime_stats measurement overhead

Browse Source 
Use a single micros() call in WarnIfComponentBlockingGuard::finish()
for both runtime stats recording and blocking detection. Previously
finish() called millis() for blocking detection and a separate
non-inlined record_runtime_stats_() that called micros() again.

Changes:
- Inline record_runtime_stats_() to avoid function call overhead
- Derive curr_time from micros()/1000 instead of separate millis() call
- Override started_ from micros()/1000 in constructor so both timestamps
  use the same clock source (fixes unsigned underflow on platforms where
  millis() and micros()/1000 can diverge)
- Extract check_blocking_() as inline helper for readability
This commit is contained in:
J. Nick Koston
2026-04-01 13:17:18 -10:00
parent 813b142b72
commit 3c890eb994
2 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/core/component.cpp
-7
View File
@@ -519,13 +519,6 @@ WarnIfComponentBlockingGuard::warn_blocking(Component *component, uint32_t block
}
}
#ifdef USE_RUNTIME_STATS
void WarnIfComponentBlockingGuard::record_runtime_stats_() {
uint32_t duration_us = micros() - this->started_us_;
this->component_->runtime_stats_.record_time(duration_us);
}
#endif
#ifdef USE_SETUP_PRIORITY_OVERRIDE
void clear_setup_priority_overrides() {
// Free the setup priority map completely
esphome/core/component.h
+26 -12
View File
@@ -628,23 +628,22 @@ class WarnIfComponentBlockingGuard {
started_us_(micros())
#endif
{
#ifdef USE_RUNTIME_STATS
// Use micros()-derived ms for both stats and blocking detection so clocks match
this->started_ = this->started_us_ / 1000U;
#endif
}
// Finish the timing operation and return the current time
// Inlined: the fast path is just millis() + subtract + compare
inline uint32_t HOT finish() {
uint32_t curr_time = millis();
uint32_t blocking_time = curr_time - this->started_;
#ifdef USE_RUNTIME_STATS
this->record_runtime_stats_();
#endif
#ifndef USE_BENCHMARK
// Fast path: compare against constant threshold in ms (computed at compile time from centiseconds)
static constexpr uint32_t WARN_IF_BLOCKING_OVER_MS = static_cast<uint32_t>(WARN_IF_BLOCKING_OVER_CS) * 10U;
if (blocking_time > WARN_IF_BLOCKING_OVER_MS) [[unlikely]] {
warn_blocking(this->component_, blocking_time);
}
// Single micros() call serves both runtime stats and blocking detection.
// Converting to millis avoids the separate millis() call.
uint32_t curr_time = this->record_runtime_stats_();
#else
uint32_t curr_time = millis();
#endif
this->check_blocking_(curr_time);
return curr_time;
}
@@ -655,8 +654,23 @@ class WarnIfComponentBlockingGuard {
Component *component_;
#ifdef USE_RUNTIME_STATS
uint32_t started_us_;
void record_runtime_stats_();
// Record runtime stats and return current time in ms (derived from micros())
inline uint32_t record_runtime_stats_() {
uint32_t end_us = micros();
this->component_->runtime_stats_.record_time(end_us - this->started_us_);
return end_us / 1000U;
}
#endif
// Fast path: compare against constant threshold in ms (computed at compile time from centiseconds)
inline void check_blocking_(uint32_t curr_time) {
#ifndef USE_BENCHMARK
static constexpr uint32_t WARN_IF_BLOCKING_OVER_MS = static_cast<uint32_t>(WARN_IF_BLOCKING_OVER_CS) * 10U;
uint32_t blocking_time = curr_time - this->started_;
if (blocking_time > WARN_IF_BLOCKING_OVER_MS) [[unlikely]] {
warn_blocking(this->component_, blocking_time);
}
#endif
}
private:
// Cold path for blocking warning - defined in component.cpp