mirror of
https://github.com/yhirose/cpp-httplib.git
synced 2026-11-22 20:11:46 +00:00
Let the parking loop wait without a cap when nothing is due
parking_loop capped every Poller::wait() at one minute only to keep the millisecond timeout within an int, so an idle server woke once a minute for nothing. detail::poll_timeout_until() turns a deadline into the timeout instead: -1 when there is none, which Poller::wait() already defines as waiting until a descriptor is ready or wake() is called, otherwise whole milliseconds, rounded up and capped at INT_MAX. The rounding is now exact: adding 999 us turned a deadline 1 ns away into a timeout of 0. The loop relies on a negative timeout for the first time, so the Poller contract tests now check it on every backend.
This commit is contained in:
1 parent
51b186974b
commit
0fe58217ea
2 files changed
+49
-10
No files matched your search
@@ -4088,6 +4088,11 @@ private:
|
||||
// The best poller for this platform, or nullptr when it cannot be created.
|
||||
std::unique_ptr<Poller> 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<Poller> 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<milliseconds>(left);
|
||||
if (msec < left) { msec += milliseconds(1); }
|
||||
const auto cap = milliseconds((std::numeric_limits<int>::max)());
|
||||
return static_cast<int>((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<std::chrono::milliseconds>(
|
||||
until - now + std::chrono::microseconds(999));
|
||||
poller.wait(static_cast<int>((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();
|
||||
|
||||
|
||||
Reference in new issue
Block a user