From 3d85cf56d6ff324cdd97a0d81e80e96a7bc3421d Mon Sep 17 00:00:00 2001 From: yhirose Date: Sat, 21 Nov 2026 22:45:12 -0500 Subject: [PATCH] Tidy two spots left from the keep-alive parking review drain_and_close_socket() checks the size bound before it reads the clock, which saves a clock read on a drain that stops at 1 MB, and the comment on PollPoller::fds_ fits on one line. Nothing else changes. --- httplib.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/httplib.h b/httplib.h index 3e98595a..6d81b755 100644 --- a/httplib.h +++ b/httplib.h @@ -4034,8 +4034,7 @@ private: PollerWaker waker_; - // fds_[0] is the waker's, which is always armed; tokens_[i] belongs to - // fds_[i]. + // fds_[0] is the waker's, always armed; tokens_[i] belongs to fds_[i]. std::vector fds_; std::vector tokens_; std::unordered_map index_; @@ -7384,7 +7383,7 @@ inline void drain_and_close_socket(socket_t sock, const auto n = read_socket(sock, buf, sizeof(buf), CPPHTTPLIB_RECV_FLAGS); if (n <= 0) { break; } total += static_cast(n); - } while (usec_left() > 0 && total < size_t(1024u * 1024u)); // bound #2 + } while (total < size_t(1024u * 1024u) && usec_left() > 0); // bound #2 shutdown_socket(sock); close_socket(sock);