Page MenuHomeFreeBSD
Files F107424877

D39136.id118951.diff
No OneTemporary
Actions

D39136.id118951.diff
View Options

diff --git a/share/man/man9/condvar.9 b/share/man/man9/condvar.9
--- a/share/man/man9/condvar.9
+++ b/share/man/man9/condvar.9
@@ -251,11 +251,11 @@
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
--- a/share/man/man9/epoch.9
+++ b/share/man/man9/epoch.9
@@ -267,14 +267,14 @@
.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
--- a/share/man/man9/locking.9
+++ b/share/man/man9/locking.9
@@ -422,6 +422,7 @@
.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 @@
.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
--- a/share/man/man9/sleep.9
+++ b/share/man/man9/sleep.9
@@ -366,13 +366,13 @@
.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
--- a/share/man/man9/sleepqueue.9
+++ b/share/man/man9/sleepqueue.9
@@ -383,8 +383,8 @@
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
--- a/share/man/man9/tvtohz.9
+++ b/share/man/man9/tvtohz.9
@@ -45,9 +45,9 @@
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
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -728,7 +728,7 @@
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;

File Metadata

Mime Type
text/plain
Expires
Tue, Jan 14, 11:53 PM (8 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15800307
Default Alt Text
D39136.id118951.diff (2 KB)

Event Timeline