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

Merge branch 'webserver_lock_churn' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-07-03 13:35:15 -05:00
parent 32f0322dec 7a33994666
commit 4bb016fec3
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
esphome/components/web_server/web_server.cpp
View File

@@ -332,7 +332,8 @@ void WebServer::setup() {
} }
void WebServer::loop() { void WebServer::loop() {
#ifdef USE_ESP32 #ifdef USE_ESP32
if (xSemaphoreTake(this->to_schedule_lock_, 0L)) { // Check atomic flag first to avoid taking semaphore when queue is empty
if (this->to_schedule_has_items_.load(std::memory_order_relaxed) && xSemaphoreTake(this->to_schedule_lock_, 0L)) {
std::function<void()> fn; std::function<void()> fn;
if (!to_schedule_.empty()) { if (!to_schedule_.empty()) {
// scheduler execute things out of order which may lead to incorrect state // scheduler execute things out of order which may lead to incorrect state
@@ -340,6 +341,9 @@ void WebServer::loop() {
// let's execute it directly from the loop // let's execute it directly from the loop
fn = std::move(to_schedule_.front()); fn = std::move(to_schedule_.front());
to_schedule_.pop_front(); to_schedule_.pop_front();
if (to_schedule_.empty()) {
this->to_schedule_has_items_.store(false, std::memory_order_relaxed);
}
} }
xSemaphoreGive(this->to_schedule_lock_); xSemaphoreGive(this->to_schedule_lock_);
if (fn) { if (fn) {
@@ -2095,6 +2099,7 @@ void WebServer::schedule_(std::function<void()> &&f) {
#ifdef USE_ESP32 #ifdef USE_ESP32
xSemaphoreTake(this->to_schedule_lock_, portMAX_DELAY); xSemaphoreTake(this->to_schedule_lock_, portMAX_DELAY);
to_schedule_.push_back(std::move(f)); to_schedule_.push_back(std::move(f));
this->to_schedule_has_items_.store(true, std::memory_order_relaxed);
xSemaphoreGive(this->to_schedule_lock_); xSemaphoreGive(this->to_schedule_lock_);
#else #else
this->defer(std::move(f)); this->defer(std::move(f));

2
esphome/components/web_server/web_server.h
View File

@@ -18,6 +18,7 @@
#include <freertos/FreeRTOS.h> #include <freertos/FreeRTOS.h>
#include <freertos/semphr.h> #include <freertos/semphr.h>
#include <deque> #include <deque>
#include <atomic>
#endif #endif
#if USE_WEBSERVER_VERSION >= 2 #if USE_WEBSERVER_VERSION >= 2
@@ -524,6 +525,7 @@ class WebServer : public Controller, public Component, public AsyncWebHandler {
#ifdef USE_ESP32 #ifdef USE_ESP32
std::deque<std::function<void()>> to_schedule_; std::deque<std::function<void()>> to_schedule_;
SemaphoreHandle_t to_schedule_lock_; SemaphoreHandle_t to_schedule_lock_;
std::atomic<bool> to_schedule_has_items_{false};
#endif #endif
}; };