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

[api] Swap sentinel values: WRITE_FAILED=-1 matches write() return

Browse Source 
WRITE_FAILED=-1 matches the socket write() return value directly,
so the fast path can pass sent through without remapping. Simplifies
both the inline fast path and the slow path errno check.
This commit is contained in:
J. Nick Koston
2026-03-29 14:12:31 -10:00
parent 5f2ad82a67
commit d91484c19f
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/api/api_frame_helper.cpp
+2 -2
View File
@@ -138,8 +138,8 @@ APIError APIFrameHelper::write_raw_iov_(const struct iovec *iov, int iovcnt, uin
// Partial write or -1: fall through to error check / enqueue below
}
}
// WRITE_FAILED or write above returned -1: check errno
if (sent == WRITE_FAILED || sent == -1) {
// WRITE_FAILED (-1): fast path or retry write returned -1, check errno
if (sent == WRITE_FAILED) {
int err = errno;
if (err != EWOULDBLOCK && err != EAGAIN) {
this->state_ = State::FAILED;
esphome/components/api/api_frame_helper.h
+4 -6
View File
@@ -193,8 +193,8 @@ class APIFrameHelper {
APIError drain_overflow_and_handle_errors_();
// Sentinel values for the sent parameter in write_raw_ methods
static constexpr ssize_t WRITE_NOT_ATTEMPTED = -1; // Cold path: no write attempted yet
static constexpr ssize_t WRITE_FAILED = -2; // Fast path: write() returned -1
static constexpr ssize_t WRITE_FAILED = -1; // Fast path: write()/writev() returned -1
static constexpr ssize_t WRITE_NOT_ATTEMPTED = -2; // Cold path: no write attempted yet
// Inlined write methods — used by hot paths (write_protobuf_packet, write_protobuf_messages)
// These inline the fast path (overflow empty + full write) and tail-call the out-of-line
@@ -204,8 +204,7 @@ class APIFrameHelper {
ssize_t sent = this->socket_->write(data, len);
if (sent == static_cast<ssize_t>(len)) [[likely]]
return APIError::OK;
if (sent == -1)
return this->write_raw_buf_(data, len, WRITE_FAILED);
// sent is -1 (WRITE_FAILED) or partial write count
return this->write_raw_buf_(data, len, sent);
}
return this->write_raw_buf_(data, len, WRITE_NOT_ATTEMPTED);
@@ -216,8 +215,7 @@ class APIFrameHelper {
ssize_t sent = this->socket_->writev(iov, iovcnt);
if (sent == static_cast<ssize_t>(total_write_len)) [[likely]]
return APIError::OK;
if (sent == -1)
return this->write_raw_iov_(iov, iovcnt, total_write_len, WRITE_FAILED);
// sent is -1 (WRITE_FAILED) or partial write count
return this->write_raw_iov_(iov, iovcnt, total_write_len, sent);
}
return this->write_raw_iov_(iov, iovcnt, total_write_len, WRITE_NOT_ATTEMPTED);