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

Fix scheduler

Browse Source
This commit is contained in:
Otto Winter
2019-06-09 13:19:57 +02:00
parent 75630a36f8
commit 8db6f3129c
3 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
esphome/core/scheduler.cpp
View File

@@ -65,7 +65,7 @@ bool HOT Scheduler::cancel_interval(Component *component, const std::string &nam
return this->cancel_item_(component, name, SchedulerItem::INTERVAL); return this->cancel_item_(component, name, SchedulerItem::INTERVAL);
} }
optional<uint32_t> HOT Scheduler::next_schedule_in() { optional<uint32_t> HOT Scheduler::next_schedule_in() {
if (!this->peek_()) if (this->items_.empty())
return {}; return {};
auto *item = this->items_[0]; auto *item = this->items_[0];
const uint32_t now = millis(); const uint32_t now = millis();
@@ -79,8 +79,8 @@ void ICACHE_RAM_ATTR HOT Scheduler::call() {
this->process_to_add(); this->process_to_add();
while (true) { while (true) {
bool has_item = this->peek_(); this->cleanup_();
if (!has_item) if (this->items_.empty())
// No more item left, done! // No more item left, done!
break; break;
@@ -132,14 +132,14 @@ void ICACHE_RAM_ATTR HOT Scheduler::call() {
this->process_to_add(); this->process_to_add();
} }
void HOT Scheduler::process_to_add() { void HOT Scheduler::process_to_add() {
for (auto &it : this->to_add_) { for (auto *it : this->to_add_) {
if (it->remove) { if (it->remove) {
delete it; delete it;
continue; continue;
} }
this->items_.push_back(it); this->items_.push_back(it);
std::push_heap(this->items_.begin(), this->items_.end()); std::push_heap(this->items_.begin(), this->items_.end(), SchedulerItem::cmp);
} }
this->to_add_.clear(); this->to_add_.clear();
} }
@@ -153,12 +153,8 @@ void HOT Scheduler::cleanup_() {
this->pop_raw_(); this->pop_raw_();
} }
} }
bool HOT Scheduler::peek_() {
this->cleanup_();
return !this->items_.empty();
}
void HOT Scheduler::pop_raw_() { void HOT Scheduler::pop_raw_() {
std::pop_heap(this->items_.begin(), this->items_.end()); std::pop_heap(this->items_.begin(), this->items_.end(), SchedulerItem::cmp);
this->items_.pop_back(); this->items_.pop_back();
} }
void HOT Scheduler::push_(Scheduler::SchedulerItem *item) { this->to_add_.push_back(item); } void HOT Scheduler::push_(Scheduler::SchedulerItem *item) { this->to_add_.push_back(item); }
@@ -169,7 +165,7 @@ bool HOT Scheduler::cancel_item_(Component *component, const std::string &name,
it->remove = true; it->remove = true;
ret = true; ret = true;
} }
for (auto &it : this->to_add_) for (auto *it : this->to_add_)
if (it->component == component && it->name == name && it->type == type) { if (it->component == component && it->name == name && it->type == type) {
it->remove = true; it->remove = true;
ret = true; ret = true;
@@ -178,16 +174,15 @@ bool HOT Scheduler::cancel_item_(Component *component, const std::string &name,
return ret; return ret;
} }
bool HOT Scheduler::SchedulerItem::operator<(const Scheduler::SchedulerItem &other) const { bool HOT Scheduler::SchedulerItem::cmp(Scheduler::SchedulerItem *a, Scheduler::SchedulerItem *b) {
// min-heap // min-heap
uint32_t this_next_exec = this->last_execution + this->timeout; uint32_t a_next_exec = a->last_execution + a->timeout;
bool this_overflow = this_next_exec < this->last_execution; bool a_overflow = a_next_exec < a->last_execution;
uint32_t other_next_exec = other.last_execution + other.timeout; uint32_t b_next_exec = b->last_execution + b->timeout;
bool other_overflow = other_next_exec < other.last_execution; bool b_overflow = b_next_exec < b->last_execution;
if (this_overflow == other_overflow) if (a_overflow == b_overflow)
return this_next_exec > other_next_exec; return a_next_exec > b_next_exec;
return this_overflow; return a_overflow;
} }
} // namespace esphome } // namespace esphome

3
esphome/core/scheduler.h
View File

@@ -33,11 +33,10 @@ class Scheduler {
std::function<void()> f; std::function<void()> f;
bool remove; bool remove;
bool operator<(const SchedulerItem &other) const; static bool cmp(SchedulerItem *a, SchedulerItem *b);
}; };
void cleanup_(); void cleanup_();
bool peek_();
void pop_raw_(); void pop_raw_();
void push_(SchedulerItem *item); void push_(SchedulerItem *item);
bool cancel_item_(Component *component, const std::string &name, SchedulerItem::Type type); bool cancel_item_(Component *component, const std::string &name, SchedulerItem::Type type);