jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-08-06 18:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split LockFreeQueue into base and notifying variants to reduce memory usage

Browse Source
This commit is contained in:
J. Nick Koston 2025-07-05 08:59:19 -05:00
parent e173b7f0c2
commit dfcc3206f7
No known key found for this signature in database
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
esphome/core/lock_free_queue.h
View File

@ -38,12 +38,13 @@ template<class T, uint8_t SIZE> class LockFreeQueue {
bool push(T *element) { bool push(T *element) {
bool was_empty; bool was_empty;
return push_internal_(element, was_empty); uint8_t old_tail;
return push_internal_(element, was_empty, old_tail);
} }
protected: protected:
// Internal push that reports if queue was empty - for use by derived classes // Internal push that reports queue state - for use by derived classes
bool push_internal_(T *element, bool &was_empty) { bool push_internal_(T *element, bool &was_empty, uint8_t &old_tail) {
if (element == nullptr) if (element == nullptr)
return false; return false;
@ -60,6 +61,7 @@ template<class T, uint8_t SIZE> class LockFreeQueue {
} }
was_empty = (current_tail == head_before); was_empty = (current_tail == head_before);
old_tail = current_tail;
buffer_[current_tail] = element; buffer_[current_tail] = element;
tail_.store(next_tail, std::memory_order_release); tail_.store(next_tail, std::memory_order_release);
@ -116,7 +118,8 @@ template<class T, uint8_t SIZE> class NotifyingLockFreeQueue : public LockFreeQu
bool push(T *element) { bool push(T *element) {
bool was_empty; bool was_empty;
bool result = this->push_internal_(element, was_empty); uint8_t old_tail;
bool result = this->push_internal_(element, was_empty, old_tail);
// Notify optimization: only notify if we need to // Notify optimization: only notify if we need to
if (result && task_to_notify_ != nullptr) { if (result && task_to_notify_ != nullptr) {
@ -125,11 +128,8 @@ template<class T, uint8_t SIZE> class NotifyingLockFreeQueue : public LockFreeQu
xTaskNotifyGive(task_to_notify_); xTaskNotifyGive(task_to_notify_);
} else { } else {
// Queue wasn't empty - check if consumer has caught up to previous tail // Queue wasn't empty - check if consumer has caught up to previous tail
uint8_t current_tail = this->tail_.load(std::memory_order_relaxed);
uint8_t head_after = this->head_.load(std::memory_order_acquire); uint8_t head_after = this->head_.load(std::memory_order_acquire);
// We just pushed, so go back one position to get the old tail if (head_after == old_tail) {
uint8_t previous_tail = (current_tail + SIZE - 1) % SIZE;
if (head_after == previous_tail) {
// Consumer just caught up to where tail was - might go to sleep, must notify // Consumer just caught up to where tail was - might go to sleep, must notify
// Note: There's a benign race here - between reading head_after and calling // Note: There's a benign race here - between reading head_after and calling
// xTaskNotifyGive(), the consumer could advance further. This would result // xTaskNotifyGive(), the consumer could advance further. This would result