From nobody Mon Mar 20 20:13:31 2023 X-Original-To: dev-commits-src-main@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 4PgQsl3CM8z40BfM; Mon, 20 Mar 2023 20:13:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PgQsl2mv2z3JMv; Mon, 20 Mar 2023 20:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679343211; 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=LSWDME1QveUllroZriPJgjDGioCtKYT25TWS/e1jw94=; b=EOX6AOMk5Qw35ZHVYEWgtPWtzWmnensHIrI8JSxjyl/C4ZtxL1hWGvZHhnaN79fS0jemZn mKpuNSTcPj4KUUFgmN3oyJWJLsGjZFEV56eZWgGONOskVBZ3BPM56tOHbyA7qmd+04gUsU H27q7kVIMG5CUoLePV3Wgw0/CXVi2wVvZXthEPhU3u1PWQWwtmvXofiZNYcagKUytoXM1A PYcs3jOUMyXh3ztSziG1C9L9qj5/RTHTotKnKAk9rv3rf7hiti5cuWbAL3tzPwBy23IeSc WIetqBeFUKr5wPIYSQV9feQ7URF2EQhfxupK1j8YLuN5E4dk07TBWsD7KeGVPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679343211; 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=LSWDME1QveUllroZriPJgjDGioCtKYT25TWS/e1jw94=; b=Rcljpm1tFchm18u8k4PTIUKacPEwP43kFZHMFogtUzAwq5nHu7ScVTV+24pYMCUmPyTmzM b6p4qHgLXW8RqFSX/qB6SIdsX+IoBY9IQqp6wvB26iRp0gSz/5GHhVXOw3wAVCLtFoj43m UyHe9m+i2bllFcp7ouhC4PaMj419P/v6oSQCZVRsMgQcbOQ3xQK2sydEpfpXibfjVzC8KH xTJQO25vCsFqAk2yt7ALqWAuWb21DZNM2xiVWosPgNo0ASrJ7SrbIlB+qaYW39+fLgNkq3 I33vlZ4to1xTczKnOpT7uJ3kGifPXH4FD+wvVFwwvtdd8AEz2ZhBPPng0gtSmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679343211; a=rsa-sha256; cv=none; b=VDUwG/dvU8ezNGxRXrS8pbMbB6oi8ul/JLlJ2n11I/IHb/SLEMQPJXGlFcfD7ICPNsamEx TPkkFecqrI/SvrorelTfZRl53cN8xdtTK/mjXqnZtIZM5qYCaKc2MQYw/xvi0JK3qCaf49 n37iZXg4Ur7Ilaxvjw4E8taGxNtkJStT1Rhr2E+gugBozsp6QkdwLwC9IkEofU64LuLGIW KCuXZFU91RmrcutBESfQIujUiV/F0DmZ6I+qcSSY/5se4vW+qQ4CWJgA9TivrCrir0Qmce YL53tbN13Byzoyw8xeDa5KYWl1T8/kkOdvUlyOKW+xJjnTj+wvgliBxqu8wzPg== 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 4PgQsl1cYqzkWL; Mon, 20 Mar 2023 20:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32KKDViM033198; Mon, 20 Mar 2023 20:13:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32KKDVTO033197; Mon, 20 Mar 2023 20:13:31 GMT (envelope-from git) Date: Mon, 20 Mar 2023 20:13:31 GMT Message-Id: <202303202013.32KKDVTO033197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 8965b3033ea1 - main - callout(9): adopt old references to timeout(9) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8965b3033ea1750f2e064a130cf2f2158c6fc795 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=8965b3033ea1750f2e064a130cf2f2158c6fc795 commit 8965b3033ea1750f2e064a130cf2f2158c6fc795 Author: Mitchell Horne AuthorDate: 2023-03-20 20:00:24 +0000 Commit: Mitchell Horne CommitDate: 2023-03-20 20:12:12 +0000 callout(9): adopt old references to timeout(9) timeout(9) was removed a couple of years ago; all consumers now use the callout(9) interface. Explicitly do not bump .Dd anywhere, as this is not a content or semantic change. Reviewed by: markj, jhb, Pau Amma MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39136 --- share/man/man9/condvar.9 | 4 ++-- share/man/man9/epoch.9 | 4 ++-- share/man/man9/locking.9 | 4 ++-- share/man/man9/sleep.9 | 4 ++-- share/man/man9/sleepqueue.9 | 4 ++-- share/man/man9/tvtohz.9 | 4 ++-- sys/kern/kern_timeout.c | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/share/man/man9/condvar.9 b/share/man/man9/condvar.9 index 4a4e8741eda0..3e02f2fa40c0 100644 --- a/share/man/man9/condvar.9 +++ b/share/man/man9/condvar.9 @@ -251,11 +251,11 @@ will fail if: Timeout expired. .El .Sh SEE ALSO +.Xr callout 9 , .Xr locking 9 , .Xr mtx_pool 9 , .Xr mutex 9 , .Xr rwlock 9 , .Xr sema 9 , .Xr sleep 9 , -.Xr sx 9 , -.Xr timeout 9 +.Xr sx 9 diff --git a/share/man/man9/epoch.9 b/share/man/man9/epoch.9 index 1f191211b041..8a5008a6b238 100644 --- a/share/man/man9/epoch.9 +++ b/share/man/man9/epoch.9 @@ -267,14 +267,14 @@ The .Nm kernel programming interface is under development and is subject to change. .Sh SEE ALSO +.Xr callout 9 , .Xr locking 9 , .Xr mtx_pool 9 , .Xr mutex 9 , .Xr rwlock 9 , .Xr sema 9 , .Xr sleep 9 , -.Xr sx 9 , -.Xr timeout 9 +.Xr sx 9 .Sh HISTORY The .Nm diff --git a/share/man/man9/locking.9 b/share/man/man9/locking.9 index e1e4ccd33664..64cba3b0159b 100644 --- a/share/man/man9/locking.9 +++ b/share/man/man9/locking.9 @@ -422,6 +422,7 @@ At this time this is a rather easy to remember table. .Xr witness 4 , .Xr atomic 9 , .Xr BUS_SETUP_INTR 9 , +.Xr callout 9 , .Xr condvar 9 , .Xr epoch 9 , .Xr lock 9 , @@ -433,7 +434,6 @@ At this time this is a rather easy to remember table. .Xr sema 9 , .Xr sleep 9 , .Xr smr 9 , -.Xr sx 9 , -.Xr timeout 9 +.Xr sx 9 .Sh BUGS There are too many locking primitives to choose from. diff --git a/share/man/man9/sleep.9 b/share/man/man9/sleep.9 index 78625e5e1184..1a471bcfc00d 100644 --- a/share/man/man9/sleep.9 +++ b/share/man/man9/sleep.9 @@ -366,13 +366,13 @@ A non-zero timeout was specified and the timeout expired. .El .Sh SEE ALSO .Xr ps 1 , +.Xr callout 9 , .Xr locking 9 , .Xr malloc 9 , .Xr mi_switch 9 , .Xr mtx_sleep 9 , .Xr rw_sleep 9 , -.Xr sx_sleep 9 , -.Xr timeout 9 +.Xr sx_sleep 9 .Sh HISTORY The functions .Fn sleep diff --git a/share/man/man9/sleepqueue.9 b/share/man/man9/sleepqueue.9 index 64dfc3bdee55..ae3bbaab7460 100644 --- a/share/man/man9/sleepqueue.9 +++ b/share/man/man9/sleepqueue.9 @@ -383,8 +383,8 @@ interfaces. Almost all other code in the kernel should use one of those interfaces rather than manipulating sleep queues directly. .Sh SEE ALSO +.Xr callout 9 , .Xr condvar 9 , .Xr runqueue 9 , .Xr scheduler 9 , -.Xr sleep 9 , -.Xr timeout 9 +.Xr sleep 9 diff --git a/share/man/man9/tvtohz.9 b/share/man/man9/tvtohz.9 index cf07d603a790..d3918bdb85c6 100644 --- a/share/man/man9/tvtohz.9 +++ b/share/man/man9/tvtohz.9 @@ -45,9 +45,9 @@ of system ticks that would elapse. Returns the integral number of system ticks expected to elapse in the given interval, including the current tick. .Sh SEE ALSO +.Xr callout 9 , .Xr microtime 9 , -.Xr microuptime 9 , -.Xr timeout 9 +.Xr microuptime 9 .Sh HISTORY The .Nm diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 0ac0eca36da4..05497f3d46d7 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -728,7 +728,7 @@ softclock_call_cc(struct callout *c, struct callout_cpu *cc, if (lastfunc != c_func || sbt2 > maxdt * 2) { ts2 = sbttots(sbt2); printf( - "Expensive timeout(9) function: %p(%p) %jd.%09ld s\n", + "Expensive callout(9) function: %p(%p) %jd.%09ld s\n", c_func, c_arg, (intmax_t)ts2.tv_sec, ts2.tv_nsec); } maxdt = sbt2;