From nobody Fri Nov 06 11:17:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jLc8s0gVyz6xy0k for ; Fri, 06 Nov 2026 11:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jLc8r669vz3G5C for ; Fri, 06 Nov 2026 11:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793963852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6xjFRy+uWiASV3E6RCvYYM6WdQmTICPm3r7GwivDd9M=; b=PBTdLXzJaMGPI+Vk8WG469Ok++P9VmXjFuxkfIVW5MCZNgbMkAo+Oq/Zl7GfdUNTAA6w4l hW5U4QqUJMS5nKGk2Na99xZXXwPac3COWekKw9KZ1Xq3TRU5e1YoPscy4Al9Hz5CFtargm f7RpQNJbOcd1preoJtwpx77H2dhTn6ZP7HvBMq8yUFyE1oXGj4ynniGgGo+Abe3OZCy+HN 5UmZzIZA3EuSOFXF0GQRDtRNz1yclhdyklhHwefC8ycXk6MncqPmZY7pRN95nX/+Lk7dzB MvXKxDzXVjImjWU3q/GGmkA5xC6ufjtSiU1CzTLQ+B7hAJtOtMRyjn6LSVzd9g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793963852; b=aUaAg1keXXOBzKvu7Imlmy91DDutmR+moje5fnwSrGqNpbP3jOUB/6JtNHF9bfa5wTQdr2 2Fn+6YH4aUvUuakh883bp1rAmcTa+KudOJEDWIKt0dv9JKEPIXmcgSJDRdunVIB4jEDBsu aQr4hu8EnKGdQohDT1GZz5aeIMTugrBKnf7Amg5AQq1JuEJs9m2SF1H78hLoQPqh02aCcW MYicOQEbp+SwPpxVELktsjolBM7zheqoXXgGRgYy6vaGnQWMJq2+xVNbrugXfqmtVQ9QfA AdPhv2PoLs71zOFncVMzJRYNv1Hg8GCdIKZ+f1pvYc9ZxfGP5VHQ4hElSKiLhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793963852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6xjFRy+uWiASV3E6RCvYYM6WdQmTICPm3r7GwivDd9M=; b=YLNd6JLE/Zd73avDKty+0Er2vtUkixIouM4M+6Lwo0fNHfpdDeD9E777gnUii2ncEM7X2m ZMtXotac2CZ7YPUB2aQho6cVilzbNVaKCuSsal4vEDs2AK5eIEBp+dWFMbUeWOVEruhrrV BskDg7ie1OvyTPy4sGLr96hWqagnXRnfBdtwvAb1lvm/npoPHNajRbTrEBHy9029SG9K3x 8BEv1Rb77eV3QwKTsvRtKa2gcx0Ode+zgTB3HJnm12p6Bm82F1lM1BYBc+BGxSFwjTQUdk zf5DwkJvKdK8wtOR+OKdl/QFMW6qRLf3sQvaVmyGFlogSo0Lc1a9YOUUkmJY4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jLc8r5QVFzZWy for ; Fri, 06 Nov 2026 11:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e981 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Nov 2026 11:17:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: feab010f4414 - main - libfetch: Use monotonic clock for timeouts List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: feab010f44143bda407438ede72f4b8e0c1bd15d Auto-Submitted: auto-generated Date: Fri, 06 Nov 2026 11:17:27 +0000 Message-Id: <6aedb747.3e981.6b807a15@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=feab010f44143bda407438ede72f4b8e0c1bd15d commit feab010f44143bda407438ede72f4b8e0c1bd15d Author: Dag-Erling Smørgrav AuthorDate: 2026-11-06 11:16:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-06 11:16:42 +0000 libfetch: Use monotonic clock for timeouts MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D61225 --- lib/libfetch/common.c | 86 +++++++++++++++++++++++---------------------------- 1 file changed, 38 insertions(+), 48 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index c15b22a41603..023c491aa852 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -578,18 +578,31 @@ fetch_socks5_getenv(char **host, int *port) } +/* + * Return current time in milliseconds since an arbitrary epoch. + */ +typedef unsigned long mstime_t; +static mstime_t +mstime_mono(void) +{ + struct timespec ts; + + (void)clock_gettime(CLOCK_MONOTONIC, &ts); + return ((mstime_t)ts.tv_sec * 1000 + ts.tv_nsec / 1000000); +} + /* * Establish a TCP connection to the specified port on the specified host. */ conn_t * fetch_connect(const char *host, int port, int af, int verbose) { - struct timeval now, timeout, delta; struct pollfd pfd; struct addrinfo *cais = NULL, *sais = NULL, *cai, *sai; const char *bindaddr; conn_t *conn = NULL; - int deltams, err = 0, serrno, sd = -1; + mstime_t now, deadline, deltams; + int err = 0, serrno, sd = -1; char *sockshost; int socksport; @@ -630,10 +643,8 @@ fetch_connect(const char *host, int port, int af, int verbose) /* try each server address in turn */ for (err = 0, sai = sais; sai != NULL; sai = sai->ai_next) { /* start the clock */ - if (fetchTimeout > 0) { - gettimeofday(&timeout, NULL); - timeout.tv_sec += fetchTimeout; - } + if (fetchTimeout > 0) + deadline = mstime_mono() + fetchTimeout * 1000; /* open socket */ if ((sd = socket(sai->ai_family, SOCK_STREAM, 0)) < 0) { @@ -665,22 +676,18 @@ fetch_connect(const char *host, int port, int af, int verbose) goto next; /* wait for connection */ + deltams = INFTIM; + pfd.fd = sd; + pfd.events = POLLOUT; for (;;) { - deltams = INFTIM; - pfd.fd = sd; - pfd.events = POLLOUT; - /* check the clock */ if (fetchTimeout > 0) { - gettimeofday(&now, NULL); - if (!timercmp(&timeout, &now, >)) { + if ((now = mstime_mono()) > deadline) { errno = ETIMEDOUT; err = -1; goto next; } - timersub(&timeout, &now, &delta); - deltams = delta.tv_sec * 1000 + - delta.tv_usec / 1000; + deltams = deadline - now; } /* wait for something to happen */ if ((err = poll(&pfd, 1, deltams)) > 0) @@ -1219,9 +1226,9 @@ int fetch_ssl(conn_t *conn, const struct url *URL, int verbose) { #ifdef WITH_SSL - struct timeval now, timeout, delta; struct pollfd pfd; - int deltams, ret, ssl_err; + mstime_t now, deadline, deltams; + int ret, ssl_err; X509_NAME *name; char *str; @@ -1253,10 +1260,8 @@ fetch_ssl(conn_t *conn, const struct url *URL, int verbose) return (-1); } #endif - if (fetchTimeout > 0) { - gettimeofday(&timeout, NULL); - timeout.tv_sec += fetchTimeout; - } + if (fetchTimeout > 0) + deadline = mstime_mono() + fetchTimeout * 1000; deltams = INFTIM; pfd.fd = conn->sd; while ((ret = SSL_connect(conn->ssl)) == -1) { @@ -1274,15 +1279,12 @@ fetch_ssl(conn_t *conn, const struct url *URL, int verbose) } /* check what's left of our timeout */ if (fetchTimeout > 0) { - gettimeofday(&now, NULL); - if (!timercmp(&timeout, &now, >)) { + if ((now = mstime_mono()) > deadline) { errno = ETIMEDOUT; fetch_syserr(); return (-1); } - timersub(&timeout, &now, &delta); - deltams = delta.tv_sec * 1000 + - delta.tv_usec / 1000; + deltams = deadline - now; } ret = poll(&pfd, 1, deltams); if (ret == 0) { @@ -1392,15 +1394,12 @@ fetch_ssl_write(SSL *ssl, void *buf, size_t len) ssize_t fetch_read(conn_t *conn, void *buf, size_t len) { - struct timeval now, timeout, delta; struct pollfd pfd; ssize_t rlen, total; - int deltams; + mstime_t now, deadline, deltams; - if (fetchTimeout > 0) { - gettimeofday(&timeout, NULL); - timeout.tv_sec += fetchTimeout; - } + if (fetchTimeout > 0) + deadline = mstime_mono() + fetchTimeout * 1000; deltams = INFTIM; pfd.fd = conn->sd; @@ -1453,15 +1452,12 @@ fetch_read(conn_t *conn, void *buf, size_t len) } /* check what's left of our timeout */ if (fetchTimeout > 0) { - gettimeofday(&now, NULL); - if (!timercmp(&timeout, &now, >)) { + if ((now = mstime_mono()) > deadline) { errno = ETIMEDOUT; fetch_syserr(); return (-1); } - timersub(&timeout, &now, &delta); - deltams = delta.tv_sec * 1000 + - delta.tv_usec / 1000; + deltams = deadline - now; } /* wait for the socket to become readable */ if (poll(&pfd, 1, deltams) < 0) { @@ -1637,15 +1633,12 @@ fetch_write(conn_t *conn, const void *buf, size_t len) ssize_t fetch_writev(conn_t *conn, struct iovec *iov, int iovcnt) { - struct timeval now, timeout, delta; struct pollfd pfd; ssize_t wlen, total; - int deltams; + mstime_t now, deadline, deltams; - if (fetchTimeout > 0) { - gettimeofday(&timeout, NULL); - timeout.tv_sec += fetchTimeout; - } + if (fetchTimeout > 0) + deadline = mstime_mono() + fetchTimeout * 1000; deltams = INFTIM; pfd.fd = conn->sd; @@ -1701,15 +1694,12 @@ fetch_writev(conn_t *conn, struct iovec *iov, int iovcnt) } /* check what's left of our timeout */ if (fetchTimeout > 0) { - gettimeofday(&now, NULL); - if (!timercmp(&timeout, &now, >)) { + if ((now = mstime_mono()) > deadline) { errno = ETIMEDOUT; fetch_syserr(); return (-1); } - timersub(&timeout, &now, &delta); - deltams = delta.tv_sec * 1000 + - delta.tv_usec / 1000; + deltams = deadline - now; } /* wait for the socket to become writeable */ if (poll(&pfd, 1, deltams) < 0) {