github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-12 07:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

inline ready() for full inlining chain

Browse Source
This commit is contained in:
J. Nick Koston
2026-03-01 14:37:35 -10:00
parent 85bd364093
commit 48622dadbc
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/socket/bsd_sockets_impl.cpp
-6
View File
@@ -59,12 +59,6 @@ int BSDSocketImpl::setblocking(bool blocking) {
return 0;
}
#ifdef USE_LWIP_FAST_SELECT
bool BSDSocketImpl::ready() const { return socket_ready(this->cached_sock_, this->loop_monitored_); }
#else
bool BSDSocketImpl::ready() const { return socket_ready_fd(this->fd_, this->loop_monitored_); }
#endif
size_t BSDSocketImpl::getpeername_to(std::span<char, SOCKADDR_STR_LEN> buf) {
struct sockaddr_storage storage;
socklen_t len = sizeof(storage);
esphome/components/socket/lwip_sockets_impl.cpp
-6
View File
@@ -59,12 +59,6 @@ int LwIPSocketImpl::setblocking(bool blocking) {
return 0;
}
#ifdef USE_LWIP_FAST_SELECT
bool LwIPSocketImpl::ready() const { return socket_ready(this->cached_sock_, this->loop_monitored_); }
#else
bool LwIPSocketImpl::ready() const { return socket_ready_fd(this->fd_, this->loop_monitored_); }
#endif
size_t LwIPSocketImpl::getpeername_to(std::span<char, SOCKADDR_STR_LEN> buf) {
struct sockaddr_storage storage;
socklen_t len = sizeof(storage);
esphome/components/socket/socket.h
+12
View File
@@ -51,6 +51,18 @@ inline bool socket_ready(struct lwip_sock *cached_sock, bool loop_monitored) {
bool socket_ready_fd(int fd, bool loop_monitored);
#endif
// Inline ready() — defined here because it depends on socket_ready/socket_ready_fd
// declared above, while the impl headers are included before those declarations.
#if defined(USE_SOCKET_IMPL_BSD_SOCKETS) || defined(USE_SOCKET_IMPL_LWIP_SOCKETS)
inline bool Socket::ready() const {
#ifdef USE_LWIP_FAST_SELECT
return socket_ready(this->cached_sock_, this->loop_monitored_);
#else
return socket_ready_fd(this->fd_, this->loop_monitored_);
#endif
}
#endif
/// Create a socket of the given domain, type and protocol.
std::unique_ptr<Socket> socket(int domain, int type, int protocol);
/// Create a socket in the newest available IP domain (IPv6 or IPv4) of the given type and protocol.