sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-30 22:53:59 +00:00
Code Issues Releases Wiki Activity

[core] Initialize looping_components_ before setup blocking phase (#9820)

Browse Source
This commit is contained in:
J. Nick Koston
2025-07-22 16:43:22 -10:00
committed by GitHub
parent d7a5db3dda
commit b636b844fc
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
esphome/core/application.cpp
View File

@@ -55,6 +55,9 @@ void Application::setup() {
return a->get_actual_setup_priority() > b->get_actual_setup_priority(); return a->get_actual_setup_priority() > b->get_actual_setup_priority();
}); });
// Initialize looping_components_ early so enable_pending_loops_() works during setup
this->calculate_looping_components_();
for (uint32_t i = 0; i < this->components_.size(); i++) { for (uint32_t i = 0; i < this->components_.size(); i++) {
Component *component = this->components_[i]; Component *component = this->components_[i];
@@ -97,7 +100,6 @@ void Application::setup() {
clear_setup_priority_overrides(); clear_setup_priority_overrides();
this->schedule_dump_config(); this->schedule_dump_config();
this->calculate_looping_components_();
} }
void Application::loop() { void Application::loop() {
uint8_t new_app_state = 0; uint8_t new_app_state = 0;
@@ -269,24 +271,16 @@ void Application::calculate_looping_components_() {
// Pre-reserve vector to avoid reallocations // Pre-reserve vector to avoid reallocations
this->looping_components_.reserve(total_looping); this->looping_components_.reserve(total_looping);
// First add all active components // Add all components with loop override
// When called at start of setup, all components are in CONSTRUCTION state
// so none will be LOOP_DONE yet - they'll all go in the active section
for (auto *obj : this->components_) { for (auto *obj : this->components_) {
if (obj->has_overridden_loop() && if (obj->has_overridden_loop()) {
(obj->get_component_state() & COMPONENT_STATE_MASK) != COMPONENT_STATE_LOOP_DONE) {
this->looping_components_.push_back(obj); this->looping_components_.push_back(obj);
} }
} }
this->looping_components_active_end_ = this->looping_components_.size(); this->looping_components_active_end_ = this->looping_components_.size();
// Then add all inactive (LOOP_DONE) components
// This handles components that called disable_loop() during setup, before this method runs
for (auto *obj : this->components_) {
if (obj->has_overridden_loop() &&
(obj->get_component_state() & COMPONENT_STATE_MASK) == COMPONENT_STATE_LOOP_DONE) {
this->looping_components_.push_back(obj);
}
}
} }
void Application::disable_component_loop_(Component *component) { void Application::disable_component_loop_(Component *component) {