github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-12 07:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/inline-finish-guard' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2026-03-15 18:12:04 -10:00
parent a6c051ddce 0c72491498
commit 97458f71d0
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/core/component.cpp
+2 -1
View File
@@ -523,7 +523,8 @@ 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; }
void __attribute__((noinline, cold)) warn_blocking(Component *component, uint32_t blocking_time) {
void __attribute__((noinline, cold))
WarnIfComponentBlockingGuard::warn_blocking_(Component *component, uint32_t blocking_time) {
bool should_warn;
if (component != nullptr) {
should_warn = component->should_warn_of_blocking(blocking_time);
esphome/core/component.h
+5 -4
View File
@@ -578,9 +578,6 @@ class PollingComponent : public Component {
// millis() and micros() are available via hal.h
// Cold path for blocking warning - defined in component.cpp
void warn_blocking(Component *component, uint32_t blocking_time);
class WarnIfComponentBlockingGuard {
public:
WarnIfComponentBlockingGuard(Component *component, uint32_t start_time)
@@ -602,7 +599,7 @@ class WarnIfComponentBlockingGuard {
this->record_runtime_stats_();
#endif
if (blocking_time > WARN_IF_BLOCKING_OVER_MS) [[unlikely]] {
warn_blocking(this->component_, blocking_time);
warn_blocking_(this->component_, blocking_time);
}
return curr_time;
}
@@ -616,6 +613,10 @@ class WarnIfComponentBlockingGuard {
uint32_t started_us_;
void record_runtime_stats_();
#endif
private:
// Cold path for blocking warning - defined in component.cpp
static void __attribute__((noinline, cold)) warn_blocking_(Component *component, uint32_t blocking_time);
};
// Function to clear setup priority overrides after all components are set up