From nobody Sun Nov 15 17:28:47 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 4jSHz320R0z70k8Q for ; Sun, 15 Nov 2026 17:28:47 +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 4jSHz30X4Kz4bSH for ; Sun, 15 Nov 2026 17:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794763727; 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=f8EuNv0R/W4YhyD4UGh8cviYYjYnd/9qbWly5QfP+Gc=; b=q/WeiGByx4dnbmWc16krEWGy1HXhgCTN55kpKS4G67BvkdTFPKzXn+iqxurYA5WcoDn0bN lNNAeWyK76lLQ6i21ARmWXH56AM4LwoQG6Rb+hJt5jpQ2IMcCIkB8Np+jSzxDEM4xVRKMq Lqol69XAPamjA4lxVW4lI2FzwtnE1REsdFOpBDpTWr9MYKciIL2MvkGx11N4M3goVlUFQj 9qzg4WTXJHqxUqD9HyiAkEwBbQ2cT91vOGG+Y02vajjAe4PEyLwt5KaRQKGpWPXhM4fW5p 8J05klob5A+1Qqx6zlYwcG/TwdkynnBoP6s2uNSrFjjbIiY72CGslX9lSbbHNA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794763727; b=OVHMBUUe3Nsl8ZcYBTbgBT5SeO9kZDIGpViwbNlXVb2khA9/AUkXK4uRiPUs1GPppMV4tW Ln2karZxooDOIlgyGy0zfsZVwpkiveMw0yKlqZVcP0q09bGAS55mtLDvPRx3QM2nYGRHbt m+D/Pd7YFmsvOnnHIKGfkJX9ORzrded4pqoO2UGWvo4rs1aL/deLheFWn3X2sMXa/+PHYz atbC/Rh80mlKBkisU6Ea91Pce0CwNWh/wk4X2HxuwcNAM1d2nLCE6SYxoGZiSJV+V44/SP tcVRw6NkaWkAYXMDjRdHe4qVv4JKHqRqEf0PJvmnUOPABhreeibijmCuYVdsgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794763727; 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=f8EuNv0R/W4YhyD4UGh8cviYYjYnd/9qbWly5QfP+Gc=; b=CtkiO4Y14JaaKJnhyrWgl6g6jYQZiXlQEBG1cnReN/rARsn7Z51Dkk7PCLEtRmw05Nf68F DjDrBHawfsRwpzChEFZJ52HilVYyU/UHx0XSsSOWtZkryCyRCwZmV2ELPzBBqls7l9og7C WuJehWb/eDRm7qLqgqnz814ymmkcb9OKnehSiDNIOG9HXA8+Qwp4JW9CA0WtF+WUilhHsw GhNZLB4HyM4t/JPcnLE0YqIeOgqUlhXxee6dpbS1ZOdZfG7h8HaITmdHIdDK7PTatMoVpz QISSO3IfRuZithigUnVoQFjELrH0GY93RSUzA4tX7x96QdprfnXkvlv6GrzklQ== 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 4jSHz30BqbzGfr for ; Sun, 15 Nov 2026 17:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c0fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Nov 2026 17:28:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 1fb5bcdfa288 - stable/14 - 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 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 1fb5bcdfa288da0b8905458931613b812fce8d40 Auto-Submitted: auto-generated Date: Sun, 15 Nov 2026 17:28:47 +0000 Message-Id: <6af9ebcf.c0fc.205900a2@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1fb5bcdfa288da0b8905458931613b812fce8d40 commit 1fb5bcdfa288da0b8905458931613b812fce8d40 Author: Dag-Erling Smørgrav AuthorDate: 2026-11-06 11:16:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-14 15:49:24 +0000 libfetch: Use monotonic clock for timeouts MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D61225 (cherry picked from commit feab010f44143bda407438ede72f4b8e0c1bd15d) --- 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 5ebaee23e084..a68b9fe67fa6 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -579,18 +579,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; @@ -631,10 +644,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) { @@ -666,22 +677,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) @@ -1220,9 +1227,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; @@ -1254,10 +1261,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) { @@ -1275,15 +1280,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) { @@ -1393,15 +1395,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; @@ -1454,15 +1453,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) { @@ -1638,15 +1634,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; @@ -1702,15 +1695,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) {