sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 07:03:55 +00:00
Code Issues Releases Wiki Activity

tweak

Browse Source
This commit is contained in:
J. Nick Koston
2025-07-06 18:34:56 -05:00
parent f395767766
commit 2759f3828e
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
esphome/core/scheduler.cpp
View File

@@ -69,7 +69,7 @@ void HOT Scheduler::set_timer_common_(Component *component, SchedulerItem::Type
// Still need to cancel existing timer if name is not empty // Still need to cancel existing timer if name is not empty
if (name_cstr != nullptr && name_cstr[0] != '\0') { if (name_cstr != nullptr && name_cstr[0] != '\0') {
LockGuard guard{this->lock_}; LockGuard guard{this->lock_};
this->cancel_item_locked_(component, name_cstr, type); this->cancel_item_locked_(component, name_cstr, type, delay == 0 && type == SchedulerItem::TIMEOUT);
} }
return; return;
} }
@@ -88,7 +88,7 @@ void HOT Scheduler::set_timer_common_(Component *component, SchedulerItem::Type
if (delay == 0 && type == SchedulerItem::TIMEOUT) { if (delay == 0 && type == SchedulerItem::TIMEOUT) {
// Put in defer queue for guaranteed FIFO execution // Put in defer queue for guaranteed FIFO execution
LockGuard guard{this->lock_}; LockGuard guard{this->lock_};
this->cancel_item_locked_(component, name_cstr, type); this->cancel_item_locked_(component, name_cstr, type, true);
this->defer_queue_.push_back(std::move(item)); this->defer_queue_.push_back(std::move(item));
return; return;
} }
@@ -129,7 +129,7 @@ void HOT Scheduler::set_timer_common_(Component *component, SchedulerItem::Type
// If name is provided, do atomic cancel-and-add // If name is provided, do atomic cancel-and-add
if (name_cstr != nullptr && name_cstr[0] != '\0') { if (name_cstr != nullptr && name_cstr[0] != '\0') {
// Cancel existing items // Cancel existing items
this->cancel_item_locked_(component, name_cstr, type); this->cancel_item_locked_(component, name_cstr, type, delay == 0 && type == SchedulerItem::TIMEOUT);
} }
// Add new item directly to to_add_ // Add new item directly to to_add_
// since we have the lock held // since we have the lock held
@@ -427,11 +427,12 @@ bool HOT Scheduler::cancel_item_(Component *component, bool is_static_string, co
// obtain lock because this function iterates and can be called from non-loop task context // obtain lock because this function iterates and can be called from non-loop task context
LockGuard guard{this->lock_}; LockGuard guard{this->lock_};
return this->cancel_item_locked_(component, name_cstr, type); return this->cancel_item_locked_(component, name_cstr, type, false);
} }
// Helper to cancel items by name - must be called with lock held // Helper to cancel items by name - must be called with lock held
bool HOT Scheduler::cancel_item_locked_(Component *component, const char *name_cstr, SchedulerItem::Type type) { bool HOT Scheduler::cancel_item_locked_(Component *component, const char *name_cstr, SchedulerItem::Type type,
bool defer_only) {
size_t total_cancelled = 0; size_t total_cancelled = 0;
// Check all containers for matching items // Check all containers for matching items
@@ -448,6 +449,9 @@ bool HOT Scheduler::cancel_item_locked_(Component *component, const char *name_c
total_cancelled++; total_cancelled++;
} }
} }
if (defer_only) {
return total_cancelled > 0;
}
} }
#endif #endif

2
esphome/core/scheduler.h
View File

@@ -143,7 +143,7 @@ class Scheduler {
private: private:
// Helper to cancel items by name - must be called with lock held // Helper to cancel items by name - must be called with lock held
bool cancel_item_locked_(Component *component, const char *name, SchedulerItem::Type type); bool cancel_item_locked_(Component *component, const char *name, SchedulerItem::Type type, bool defer_only);
// Common implementation for cancel operations // Common implementation for cancel operations
bool cancel_item_(Component *component, bool is_static_string, const void *name_ptr, SchedulerItem::Type type); bool cancel_item_(Component *component, bool is_static_string, const void *name_ptr, SchedulerItem::Type type);