sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-26 23:22:21 +01:00
Code Issues Releases Wiki Activity

Merge branch 'sort_core' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-08-02 12:28:09 -10:00
parent c609341605 40dcee594b
commit 711eb2d7eb
1 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
esphome/core/application.cpp
View File

@@ -34,6 +34,44 @@ namespace esphome {
static const char *const TAG = "app";
// Helper function for insertion sort of components by setup priority
// Using insertion sort instead of std::stable_sort saves ~1.3KB of flash
// by avoiding template instantiations (std::rotate, std::stable_sort, lambdas)
// IMPORTANT: This sort is stable (preserves relative order of equal elements),
// which is necessary to maintain user-defined component order for same priority
static void insertion_sort_by_setup_priority(Component **components, size_t size) {
for (size_t i = 1; i < size; i++) {
Component *key = components[i];
float key_priority = key->get_actual_setup_priority();
int32_t j = i - 1;
// Using '<' (not '<=') ensures stability - equal priority components keep their order
while (j >= 0 && components[j]->get_actual_setup_priority() < key_priority) {
components[j + 1] = components[j];
j--;
}
components[j + 1] = key;
}
}
// Helper function for insertion sort of components by loop priority
// IMPORTANT: This sort is stable (preserves relative order of equal elements),
// which is required when components are re-sorted during setup() if they block
static void insertion_sort_by_loop_priority(Component **components, size_t size) {
for (size_t i = 1; i < size; i++) {
Component *key = components[i];
float key_priority = key->get_loop_priority();
int32_t j = i - 1;
// Using '<' (not '<=') ensures stability - equal priority components keep their order
while (j >= 0 && components[j]->get_loop_priority() < key_priority) {
components[j + 1] = components[j];
j--;
}
components[j + 1] = key;
}
}
void Application::register_component_(Component *comp) {
if (comp == nullptr) {
ESP_LOGW(TAG, "Tried to register null component!");
@@ -51,9 +89,9 @@ void Application::register_component_(Component *comp) {
void Application::setup() {
ESP_LOGI(TAG, "Running through setup()");
ESP_LOGV(TAG, "Sorting components by setup priority");
std::stable_sort(this->components_.begin(), this->components_.end(), [](const Component *a, const Component *b) {
return a->get_actual_setup_priority() > b->get_actual_setup_priority();
});
// Sort by setup priority using our helper function
insertion_sort_by_setup_priority(this->components_.data(), this->components_.size());
// Initialize looping_components_ early so enable_pending_loops_() works during setup
this->calculate_looping_components_();
@@ -69,20 +107,8 @@ void Application::setup() {
if (component->can_proceed())
continue;
// Using insertion sort instead of std::stable_sort saves ~1.3KB of flash
// by avoiding std::rotate, std::stable_sort, and lambda template instantiations.
// Insertion sort is efficient for small arrays and maintains stability
for (int32_t j = 1; j <= static_cast<int32_t>(i); j++) {
Component *key = this->components_[j];
float key_priority = key->get_loop_priority();
int32_t k = j - 1;
while (k >= 0 && this->components_[k]->get_loop_priority() < key_priority) {
this->components_[k + 1] = this->components_[k];
k--;
}
this->components_[k + 1] = key;
}
// Sort components 0 through i by loop priority
insertion_sort_by_loop_priority(this->components_.data(), i + 1);
do {
uint8_t new_app_state = STATUS_LED_WARNING;