diff --git a/httplib.h b/httplib.h index d5e53c34..3e98595a 100644 --- a/httplib.h +++ b/httplib.h @@ -4088,6 +4088,11 @@ private: // The best poller for this platform, or nullptr when it cannot be created. std::unique_ptr make_poller(); +// The Poller::wait() timeout until `deadline`: -1 for time_point::max(), +// otherwise whole milliseconds, rounded up and capped at INT_MAX. +int poll_timeout_until(std::chrono::steady_clock::time_point deadline, + std::chrono::steady_clock::time_point now); + class BufferStream final : public Stream { public: BufferStream() = default; @@ -8262,6 +8267,18 @@ inline std::unique_ptr make_poller() { return PollPoller::create(); } +inline int poll_timeout_until(std::chrono::steady_clock::time_point deadline, + std::chrono::steady_clock::time_point now) { + using namespace std::chrono; + if (deadline == (steady_clock::time_point::max)()) { return -1; } + if (deadline <= now) { return 0; } + const auto left = deadline - now; + auto msec = duration_cast(left); + if (msec < left) { msec += milliseconds(1); } + const auto cap = milliseconds((std::numeric_limits::max)()); + return static_cast((std::min)(msec, cap).count()); +} + inline bool bind_ip_address(socket_t sock, const std::string &host) { struct addrinfo hints; struct addrinfo *result; @@ -16576,16 +16593,10 @@ inline bool Server::parking_loop(TaskQueue &task_queue) { poller.arm(listen_sock, listen_token) ? never : now + check_interval; } - // At most a minute, which keeps the timeout below within an int. - auto until = (std::min)({st.next_deadline(), listen_rearm_at, next_idle, - st.backlog.empty() ? never : now + check_interval, - now + std::chrono::seconds(60)}); - // Rounded up, so that the wait does not end just short of the deadline. - auto timeout = std::chrono::duration_cast( - until - now + std::chrono::microseconds(999)); - poller.wait(static_cast((std::max)(timeout.count(), - std::chrono::milliseconds::rep(0))), - ready); + auto until = + (std::min)({st.next_deadline(), listen_rearm_at, next_idle, + st.backlog.empty() ? never : now + check_interval}); + poller.wait(detail::poll_timeout_until(until, now), ready); if (svr_sock_ != listen_sock) { break; } now = Clock::now(); diff --git a/test/test.cc b/test/test.cc index a6900b57..276e1fc6 100644 --- a/test/test.cc +++ b/test/test.cc @@ -34049,6 +34049,20 @@ TEST_P(PollerTest, WaitHonoursItsTimeout) { EXPECT_LT(elapsed, std::chrono::seconds(1)); } +TEST_P(PollerTest, NegativeTimeoutWaitsUntilReady) { + TestSocketPair sp; + ASSERT_TRUE(sp.ok()); + ASSERT_TRUE(poller_->arm(sp.reader(), 3)); + std::thread writer([&] { + std::this_thread::sleep_for(std::chrono::milliseconds(20)); + sp.make_readable(); + }); + + auto ready = wait_for(-1); + writer.join(); + EXPECT_EQ(Tokens{3}, ready); +} + TEST_P(PollerTest, OnlyTheReadyDescriptorsAreDelivered) { std::vector> sps; for (detail::Poller::Token i = 0; i < 8; i++) { @@ -34167,6 +34181,20 @@ TEST(PollerFactoryTest, MakePollerWorks) { EXPECT_TRUE(poller->wait(1000, ready)); } +TEST(PollTimeoutTest, LastsUntilTheDeadline) { + using namespace std::chrono; + const auto now = steady_clock::now(); + auto timeout = [&](steady_clock::time_point deadline) { + return detail::poll_timeout_until(deadline, now); + }; + EXPECT_EQ(-1, timeout((steady_clock::time_point::max)())); + EXPECT_EQ(0, timeout(now - milliseconds(5))); + EXPECT_EQ(1, timeout(now + nanoseconds(1))); + EXPECT_EQ(1, timeout(now + milliseconds(1))); + EXPECT_EQ(2, timeout(now + microseconds(1001))); + EXPECT_EQ((std::numeric_limits::max)(), timeout(now + hours(1000))); +} + // --------------------------------------------------------------------------- // Keep-alive parking // ---------------------------------------------------------------------------