From nobody Fri Jun 13 14:35:25 2025 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 4bJhl12HSqz5q5CF; Fri, 13 Jun 2025 14:35:25 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bJhl11VtRz3RlG; Fri, 13 Jun 2025 14:35:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749825325; 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=gJZ5PCCIZ1/4UaC9FmuOTMqPJ2yWl1JzsqRtSN+/c+g=; b=U2mmY+ywqYLLOxz7dlzEjNkWOIkXC9kz6D9/m3Jj5wE5Wf0gkeHKjuraM2oV6KUEareQsT xwWo1A0NvrKyC8LsPI46sjJFnHbNuVP25+UKYA7QCtZziR/4YR1Ijyuy+4x2Dm1RKo86Id hiyvcFx48GC4EHJzH6ECoUntkoxQjEr4B9jxgVjFsGQGorVDOHqJPDTt6v+M08ACfjqyGX AJwTKqaX7vTLw7kHgWJE93hNjzcNpwR+WO4P1EbHT1llRN5uanOHsbGmYD2sxgESgr3GKz QjoRwjzt1KYgQuvQQHIKkraVlpdJ0+Ae/VAsgT63skHAJlzv00mvTSVhnq8Dug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749825325; 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=gJZ5PCCIZ1/4UaC9FmuOTMqPJ2yWl1JzsqRtSN+/c+g=; b=cb/JFOcOV1O2p5G6GZteFKzXTC9riqBrygISe1i085AnR2pgu/JgpO2sbXqmA/zeuDeSu8 fvxiCHy9DVx7fl1loe/snNLjNB92KFPO6kLjqNqyJ2d+J7I4xHvwPbLXgvk0vp4afGTNm9 CfpuswF9SY3Yhj73CoLlagUZsjVfB4gGgPo/SsV+w/AzEH3JNLAqeseUaqi11kTCgwcJNx /Ye6i5MtRKnGCnkKfaX/UTuoCo5AtvhOBTMqBJiAoWNZdGadILZwL+AMi2ngxzmd7w+fR5 JeWv49l69C75FFO7oKOmE3Le3mSJQH/lIOeXUsTsWC6UXn3+8cKzxe7PxRruEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749825325; a=rsa-sha256; cv=none; b=c821loDJXXiLezESnx4Ovsu0N03A2MHJE+trPPHkbThIo/DYixGLNwKOZoqbgaVJ5gmoi4 J36apBy8msqcsjK6xhGbkNLs97we2/EXUVNDQ7w8s3uGk/XjcZrki76jtVEHV5kUYJYr3W bF/Y1wgo0vbcjNrzFxnxWxaYtOjUiujIXJKQY4OU45k6gzdQr26zWHd3gIf8OWnTY6CPQz WUnwI3uiRLZy+Xudb7xaccVIlU2nBWHSbYzmIYm+KZ31qzthzZjvdrCYZJuxA7aNx4Hh/Y JE1wG+iw8T/oZBbfpe6WlA943KtmrXjUZGD31X3Ogoz6aVjLIsh3cUPOdMmkjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bJhl114vSz11mZ; Fri, 13 Jun 2025 14:35:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55DEZPiK071537; Fri, 13 Jun 2025 14:35:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55DEZPQE071534; Fri, 13 Jun 2025 14:35:25 GMT (envelope-from git) Date: Fri, 13 Jun 2025 14:35:25 GMT Message-Id: <202506131435.55DEZPQE071534@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: bd8621c6cd8a - main - kern_time: minor style nits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd8621c6cd8a7499e7c8be189cf1ffd102dcc9d1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bd8621c6cd8a7499e7c8be189cf1ffd102dcc9d1 commit bd8621c6cd8a7499e7c8be189cf1ffd102dcc9d1 Author: Warner Losh AuthorDate: 2025-06-13 14:34:21 +0000 Commit: Warner Losh CommitDate: 2025-06-13 14:34:21 +0000 kern_time: minor style nits Typically we spell error values 'error' not 'err'. And fix EINVAL markup nit. Suggested by: kib Fixes: 7b7ba7857ce8 Sponsored by: Netflix --- lib/libsys/clock_gettime.2 | 4 +++- sys/kern/kern_time.c | 32 ++++++++++++++++---------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/lib/libsys/clock_gettime.2 b/lib/libsys/clock_gettime.2 index 1dcfd9d1faf7..c3b8fb92c9c1 100644 --- a/lib/libsys/clock_gettime.2 +++ b/lib/libsys/clock_gettime.2 @@ -104,7 +104,9 @@ Increments in SI seconds like a wall clock. It uses a 1970 epoch and implements the TAI timescale. Similar to CLOCK_REALTIME, but without leap seconds. It will increase monotonically during a leap second. -Will return EINVAL if the current offset between TAI and UTC is not known, +Will return +.Er EINVAL +if the current offset between TAI and UTC is not known, which may be the case early in boot before NTP or other time daemon has synchronized. .El diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index 5960136eb515..9830e5093a3a 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -321,7 +321,7 @@ kern_clock_gettime(struct thread *td, clockid_t clock_id, struct timespec *ats) struct sysclock_snap clk; struct bintime bt; struct proc *p; - int err; + int error; p = td->td_proc; switch (clock_id) { @@ -334,10 +334,10 @@ kern_clock_gettime(struct thread *td, clockid_t clock_id, struct timespec *ats) break; case CLOCK_TAI: sysclock_getsnapshot(&clk, 0); - err = sysclock_snap2bintime(&clk, &bt, clk.sysclock_active, - (clk.sysclock_active == SYSCLOCK_FFWD) ? FFCLOCK_LERP : 0); - if (err) - return (err); + error = sysclock_snap2bintime(&clk, &bt, clk.sysclock_active, + clk.sysclock_active == SYSCLOCK_FFWD ? FFCLOCK_LERP : 0); + if (error != 0) + return (error); bintime2timespec(&bt, ats); break; case CLOCK_VIRTUAL: @@ -1585,13 +1585,13 @@ static int realtimer_gettime(struct itimer *it, struct itimerspec *ovalue) { struct timespec cts; - int err; + int error; mtx_assert(&it->it_mtx, MA_OWNED); - err = kern_clock_gettime(curthread, it->it_clockid, &cts); - if (err) - return (err); + error = kern_clock_gettime(curthread, it->it_clockid, &cts); + if (error != 0) + return (error); *ovalue = it->it_time; if (ovalue->it_value.tv_sec != 0 || ovalue->it_value.tv_nsec != 0) { @@ -1613,7 +1613,7 @@ realtimer_settime(struct itimer *it, int flags, struct itimerspec *value, struct timespec cts, ts; struct timeval tv; struct itimerspec val; - int err; + int error; mtx_assert(&it->it_mtx, MA_OWNED); @@ -1633,9 +1633,9 @@ realtimer_settime(struct itimer *it, int flags, struct itimerspec *value, it->it_time = val; if (timespecisset(&val.it_value)) { - err = kern_clock_gettime(curthread, it->it_clockid, &cts); - if (err) - return (err); + error = kern_clock_gettime(curthread, it->it_clockid, &cts); + if (error != 0) + return (error); ts = val.it_value; if ((flags & TIMER_ABSTIME) == 0) { @@ -1703,12 +1703,12 @@ realtimer_expire_l(struct itimer *it, bool proc_locked) struct timeval tv; struct proc *p; uint64_t interval, now, overruns, value; - int err; + int error; - err = kern_clock_gettime(curthread, it->it_clockid, &cts); + error = kern_clock_gettime(curthread, it->it_clockid, &cts); /* Only fire if time is reached. */ - if (err == 0 && timespeccmp(&cts, &it->it_time.it_value, >=)) { + if (error == 0 && timespeccmp(&cts, &it->it_time.it_value, >=)) { if (timespecisset(&it->it_time.it_interval)) { timespecadd(&it->it_time.it_value, &it->it_time.it_interval,