mirror/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-18 15:35:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/socket_ready_devirtualize' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2026-02-10 17:41:47 -06:00
parent bc5bab7bc7 fd683a5609
commit 4b59ea322a
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
esphome/components/socket/lwip_raw_tcp_impl.cpp
View File

@@ -452,6 +452,8 @@ class LWIPRawImpl : public Socket {
errno = ENOSYS;
return -1;
}
bool ready() const override { return this->rx_buf_ != nullptr || this->rx_closed_ || this->pcb_ == nullptr; }
int setblocking(bool blocking) final {
if (pcb_ == nullptr) {
errno = ECONNRESET;
@@ -576,6 +578,8 @@ class LWIPRawListenImpl final : public LWIPRawImpl {
tcp_err(pcb_, LWIPRawImpl::s_err_fn); // Use base class error handler
}
bool ready() const override { return this->accepted_socket_count_ > 0; }
std::unique_ptr<Socket> accept(struct sockaddr *addr, socklen_t *addrlen) override {
if (pcb_ == nullptr) {
errno = EBADF;

6
esphome/components/socket/socket.cpp
View File

@@ -10,13 +10,9 @@ namespace esphome::socket {
Socket::~Socket() {}
bool Socket::ready() const {
#ifdef USE_SOCKET_SELECT_SUPPORT
return !this->loop_monitored_ || App.is_socket_ready_(this->fd_);
#else
return true;
bool Socket::ready() const { return !this->loop_monitored_ || App.is_socket_ready_(this->fd_); }
#endif
}
// Platform-specific inet_ntop wrappers
#if defined(USE_SOCKET_IMPL_LWIP_TCP)

10
esphome/components/socket/socket.h
View File

@@ -71,10 +71,14 @@ class Socket {
int get_fd() const { return -1; }
#endif
/// Check if socket has data ready to read (non-virtual for direct call)
/// For loop-monitored sockets, checks the Application's select() results
/// For non-monitored sockets, always returns true (assumes data may be available)
/// Check if socket has data ready to read
/// For select()-based sockets: non-virtual, checks Application's select() results
/// For LWIP raw TCP sockets: virtual, checks internal buffer state
#ifdef USE_SOCKET_SELECT_SUPPORT
bool ready() const;
#else
virtual bool ready() const { return true; }
#endif
protected:
#ifdef USE_SOCKET_SELECT_SUPPORT