github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-22 20:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'inline-finish-guard' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2026-03-13 20:51:57 -10:00
parent 032e9a8a90 ea1cfa9c1e
commit 9980279875
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/core/component.cpp
+3 -9
View File
@@ -522,7 +522,7 @@ void PollingComponent::stop_poller() {
uint32_t PollingComponent::get_update_interval() const { return this->update_interval_; }
void PollingComponent::set_update_interval(uint32_t update_interval) { this->update_interval_ = update_interval; }
static void __attribute__((noinline, cold)) warn_blocking(Component *component, uint32_t blocking_time) {
void __attribute__((noinline, cold)) warn_if_blocking(Component *component, uint32_t blocking_time) {
bool should_warn;
if (component != nullptr) {
should_warn = component->should_warn_of_blocking(blocking_time);
@@ -536,10 +536,8 @@ static void __attribute__((noinline, cold)) warn_blocking(Component *component,
}
}
uint32_t WarnIfComponentBlockingGuard::finish() {
uint32_t curr_time = millis();
uint32_t blocking_time = curr_time - this->started_;
#ifdef USE_RUNTIME_STATS
void WarnIfComponentBlockingGuard::record_runtime_stats_() {
// Use micros() for accurate sub-millisecond timing. millis() has insufficient
// resolution — most components complete in microseconds but millis() only has
// 1ms granularity, so results were essentially random noise.
@@ -547,12 +545,8 @@ uint32_t WarnIfComponentBlockingGuard::finish() {
uint32_t duration_us = micros() - this->started_us_;
global_runtime_stats->record_component_time(this->component_, duration_us);
}
#endif
if (blocking_time > WARN_IF_BLOCKING_OVER_MS) {
warn_blocking(this->component_, blocking_time);
}
return curr_time;
}
#endif
#ifdef USE_SETUP_PRIORITY_OVERRIDE
void clear_setup_priority_overrides() {
esphome/core/component.h
+17 -1
View File
@@ -574,10 +574,14 @@ class PollingComponent : public Component {
uint32_t update_interval_;
};
uint32_t millis(); // Forward declare for inline finish()
#ifdef USE_RUNTIME_STATS
uint32_t micros(); // Forward declare for inline constructor
#endif
// Cold path for blocking warning - defined in component.cpp
void warn_if_blocking(Component *component, uint32_t blocking_time);
class WarnIfComponentBlockingGuard {
public:
WarnIfComponentBlockingGuard(Component *component, uint32_t start_time)
@@ -591,7 +595,18 @@ class WarnIfComponentBlockingGuard {
}
// Finish the timing operation and return the current time
uint32_t finish();
// 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
if (blocking_time > WARN_IF_BLOCKING_OVER_MS) [[unlikely]] {
warn_if_blocking(this->component_, blocking_time);
}
return curr_time;
}
~WarnIfComponentBlockingGuard() = default;
@@ -600,6 +615,7 @@ class WarnIfComponentBlockingGuard {
Component *component_;
#ifdef USE_RUNTIME_STATS
uint32_t started_us_;
void record_runtime_stats_();
#endif
};