Florian/esphome
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'socket_latency' into socket_latency_loop_runtime_stats

Browse Source
This commit is contained in:
J. Nick Koston
2025-05-27 11:54:20 -05:00
parent 5f0d130910 2afdad6093
commit 4d594eae24
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
esphome/core/application.cpp
View File

@@ -7,7 +7,7 @@
#include "esphome/components/status_led/status_led.h"
#endif
#ifdef FD_SETSIZE
#if defined(FD_SETSIZE) && !defined(USE_SOCKET_IMPL_LWIP_TCP)
#include <cerrno>
#ifdef USE_ESP32
#include <sys/select.h>
@@ -122,7 +122,7 @@ void Application::loop() {
next_schedule = std::max(next_schedule, delay_time / 2);
delay_time = std::min(next_schedule, delay_time);
#ifdef FD_SETSIZE
#if defined(FD_SETSIZE) && !defined(USE_SOCKET_IMPL_LWIP_TCP)
if (!this->socket_fds_.empty()) {
// Use select() with timeout when we have sockets to monitor
@@ -238,7 +238,7 @@ bool Application::register_socket_fd(int fd) {
if (fd < 0)
return false;
#ifdef FD_SETSIZE
#if defined(FD_SETSIZE) && !defined(USE_SOCKET_IMPL_LWIP_TCP)
if (fd >= FD_SETSIZE) {
ESP_LOGE(TAG, "Cannot monitor socket fd %d: exceeds FD_SETSIZE (%d)", fd, FD_SETSIZE);
ESP_LOGE(TAG, "Socket will not be monitored for data - may cause performance issues!");
@@ -277,7 +277,7 @@ bool Application::is_socket_ready(int fd) const {
// This function is thread-safe for reading the result of select()
// However, it should only be called after select() has been executed in the main loop
// The read_fds_ is only modified by select() in the main loop
#ifdef FD_SETSIZE
#if defined(FD_SETSIZE) && !defined(USE_SOCKET_IMPL_LWIP_TCP)
if (fd < 0 || fd >= FD_SETSIZE)
return false;

8
esphome/core/application.h
View File

@@ -75,12 +75,6 @@
#include "esphome/components/update/update_entity.h"
#endif
#ifdef USE_BSD_SOCKETS
#include <sys/select.h>
#elif defined(USE_LWIP_SOCKETS) || defined(USE_SOCKET_IMPL_LWIP_SOCKETS)
#include "lwip/sockets.h"
#endif
namespace esphome {
class Application {
@@ -591,7 +585,7 @@ class Application {
std::set<int> socket_fds_; // Set of all monitored socket file descriptors
bool socket_fds_changed_{false}; // Flag to rebuild base_read_fds_ when socket_fds_ changes
int max_fd_{-1}; // Highest file descriptor number for select()
#ifdef FD_SETSIZE
#if defined(FD_SETSIZE) && !defined(USE_SOCKET_IMPL_LWIP_TCP)
fd_set base_read_fds_{}; // Cached fd_set rebuilt only when socket_fds_ changes
fd_set read_fds_{}; // Working fd_set for select(), copied from base_read_fds_
#endif