github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-06-24 12:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[scheduler] Revert cleanup_slow_path_ return type change

Browse Source 
Put cleanup_slow_path_'s return back to bool (items_ non-empty after
cleanup) as a proper slow-path for the cleanup_() wrapper. The MAX
threshold gate in Scheduler::call() reads to_remove_count_() directly
— it's a plain atomic/uint32_t load (cheap on all platforms) and
matches the pre-refactor semantic of gating on the fresh post-cleanup
value.
This commit is contained in:
J. Nick Koston
2026-04-23 05:43:06 -05:00
parent 4d9e297a0c
commit abefd0a90a
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
esphome/core/scheduler.cpp
View File

@@ -598,10 +598,14 @@ uint32_t HOT Scheduler::call(uint32_t now) {
}
#endif /* ESPHOME_DEBUG_SCHEDULER */
// cleanup_slow_path_ returns the post-cleanup to_remove_ value (read
// under lock), so the MAX gate uses the fresh count for free.
if (snap_remove > 0 && this->cleanup_slow_path_() >= MAX_LOGICALLY_DELETED_ITEMS) {
this->full_cleanup_removed_items_();
// Cleanup removed items from the top of the heap, then escalate to a full
// walk if there are still too many cancelled items stuck in the middle.
// to_remove_count_ is a cheap plain read (atomic relaxed load on ATOMICS,
// direct field read on NO_ATOMICS/SINGLE).
if (snap_remove > 0) {
this->cleanup_slow_path_();
if (this->to_remove_count_() >= MAX_LOGICALLY_DELETED_ITEMS)
this->full_cleanup_removed_items_();
}
// IMPORTANT: This loop uses index-based access (items_[0]), NOT iterators.
// This is intentional — fired intervals are pushed back into items_ via
@@ -735,7 +739,7 @@ void HOT Scheduler::process_to_add_slow_path_() {
this->to_add_.clear();
this->to_add_count_clear_();
}
uint32_t HOT Scheduler::cleanup_slow_path_() {
bool HOT Scheduler::cleanup_slow_path_() {
// We must hold the lock for the entire cleanup operation because:
// 1. We're modifying items_ (via pop_raw_locked_) which requires exclusive access
// 2. We're decrementing to_remove_ which is also modified by other threads
@@ -752,7 +756,7 @@ uint32_t HOT Scheduler::cleanup_slow_path_() {
this->to_remove_decrement_();
this->recycle_item_main_loop_(this->pop_raw_locked_());
}
return this->to_remove_count_();
return !this->items_.empty();
}
Scheduler::SchedulerItem *HOT Scheduler::pop_raw_locked_() {
std::pop_heap(this->items_.begin(), this->items_.end(), SchedulerItem::cmp);

7
esphome/core/scheduler.h
View File

@@ -312,11 +312,10 @@ class Scheduler {
inline bool ESPHOME_ALWAYS_INLINE HOT cleanup_() {
if (this->to_remove_empty_())
return !this->items_.empty();
this->cleanup_slow_path_();
return !this->items_.empty();
return this->cleanup_slow_path_();
}
// Slow path for cleanup_() - returns the post-cleanup to_remove_ count.
uint32_t cleanup_slow_path_();
// Slow path for cleanup_() when there are items to remove - defined in scheduler.cpp
bool cleanup_slow_path_();
// Slow path for process_to_add() when there are items to merge - defined in scheduler.cpp
void process_to_add_slow_path_();
// Remove and return the front item from the heap as a raw pointer.