From 201632e314e6568d46da4ae01a6f1717335f434b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 22 May 2020 09:39:36 +0200 Subject: [PATCH] tree-wide: s/time-out/timeout/g See 3f9a0a522f2029e9295ea5e9984259022be88413 for justification. --- NEWS | 8 ++++---- docs/ENVIRONMENT.md | 2 +- man/org.freedesktop.home1.xml | 2 +- man/org.freedesktop.systemd1.xml | 2 +- man/sd_bus_get_fd.xml | 14 +++++++------- man/systemctl.xml | 4 ++-- man/systemd.exec.xml | 4 ++-- src/home/home-util.h | 2 +- src/home/homework-luks.c | 2 +- src/shared/nscd-flush.c | 2 +- units/systemd-random-seed.service.in | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NEWS b/NEWS index 4c4e92b763..07e8a9925a 100644 --- a/NEWS +++ b/NEWS @@ -698,10 +698,10 @@ CHANGES WITH 243: the IO accounting data is included in the resource log message generated whenever a unit stops. - * Units may now configure an explicit time-out to wait for when killed + * Units may now configure an explicit timeout to wait for when killed with SIGABRT, for example when a service watchdog is hit. Previously, - the regular TimeoutStopSec= time-out was applied in this case too — - now a separate time-out may be set using TimeoutAbortSec=. + the regular TimeoutStopSec= timeout was applied in this case too — + now a separate timeout may be set using TimeoutAbortSec=. * Services may now send a special WATCHDOG=trigger message with sd_notify() to trigger an immediate "watchdog missed" event, and thus @@ -731,7 +731,7 @@ CHANGES WITH 243: * If processes terminated during the last phase of shutdown do not exit quickly systemd will now show their names after a short time, to make - debugging easier. After a longer time-out they are forcibly killed, + debugging easier. After a longer timeout they are forcibly killed, as before. * journalctl (and the other tools that display logs) will now highlight diff --git a/docs/ENVIRONMENT.md b/docs/ENVIRONMENT.md index fec40b1e9c..d6f5126ac2 100644 --- a/docs/ENVIRONMENT.md +++ b/docs/ENVIRONMENT.md @@ -145,7 +145,7 @@ systemd-udevd: boot loader menu through EFI a file `/run/systemd/reboot-to-boot-loader-menu` is created whenever this is requested. The file contains the requested boot loader menu timeout in µs, formatted in ASCII decimals, or zero in case no - time-out is requested. This file may be checked for by services run during + timeout is requested. This file may be checked for by services run during system shutdown in order to request the appropriate operation from the boot loader in an alternative fashion. diff --git a/man/org.freedesktop.home1.xml b/man/org.freedesktop.home1.xml index e7d12a031e..1b2c52af03 100644 --- a/man/org.freedesktop.home1.xml +++ b/man/org.freedesktop.home1.xml @@ -200,7 +200,7 @@ node /org/freedesktop/home1 { the returned error code, in case more credentials are necessary. This function is synchronous and returns only after the home directory was fully activated (or the operation failed), which might take some time. Clients must be prepared for that, and typically should extend the D-Bus method call - time-out accordingly. This method is equivalent to the Activate() method on the + timeout accordingly. This method is equivalent to the Activate() method on the org.freedesktop.home1.Home interface documented below, but may be called on the manager object and takes a user name as additional argument, instead. diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml index 9a8b788982..b6a643aaf1 100644 --- a/man/org.freedesktop.systemd1.xml +++ b/man/org.freedesktop.systemd1.xml @@ -3745,7 +3745,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { ActiveState above). The following values are currently known: success is set if the unit didn't fail. resources indicates that not enough resources were available to fork off and execute the service - processes. timeout indicates that a time-out occurred while executing a service + processes. timeout indicates that a timeout occurred while executing a service operation. exit-code indicates that a service process exited with an unclean exit code. signal indicates that a service process exited with an uncaught signal. core-dump indicates that a service process exited uncleanly and dumped diff --git a/man/sd_bus_get_fd.xml b/man/sd_bus_get_fd.xml index d9586f9003..69261af93e 100644 --- a/man/sd_bus_get_fd.xml +++ b/man/sd_bus_get_fd.xml @@ -26,7 +26,7 @@ sd_bus_get_events sd_bus_get_timeout - Get the file descriptor, I/O events and time-out to wait for from a message bus + Get the file descriptor, I/O events and timeout to wait for from a message bus object @@ -79,13 +79,13 @@ POLLIN, POLLOUT, … events, or negative on error. - sd_bus_get_timeout() returns the time-out in µs to pass to to + sd_bus_get_timeout() returns the timeout in µs to pass to to poll() or a similar call when waiting for events on the specified bus - connection. The returned time-out may be zero, in which case a subsequent I/O polling call + connection. The returned timeout may be zero, in which case a subsequent I/O polling call should be invoked in non-blocking mode. The returned timeout may be UINT64_MAX in which case the I/O polling call may block indefinitely, - without any applied time-out. Note that the returned time-out should be considered only a - maximum sleeping time. It is permissible (and even expected) that shorter time-outs are used by + without any applied timeout. Note that the returned timeout should be considered only a + maximum sleeping time. It is permissible (and even expected) that shorter timeouts are used by the calling program, in case other event sources are polled in the same event loop. Note that the returned time-value is relative and specified in microseconds. When converting this value in order to pass it as third argument to poll() (which expects milliseconds), @@ -93,7 +93,7 @@ doesn't sleep for shorter than necessary, which might result in unintended busy looping (alternatively, use ppoll3 - instead of plain poll(), which understands time-outs with nano-second + instead of plain poll(), which understands timeouts with nano-second granularity). These three functions are useful to hook up a bus connection object with an external or @@ -101,7 +101,7 @@ each invocation of the I/O polling call, all three functions should be invoked: the file descriptor returned by sd_bus_get_fd() should be polled for the events indicated by sd_bus_get_events(), and the I/O call should block for that up - to the time-out returned by sd_bus_get_timeout(). After each I/O polling + to the timeout returned by sd_bus_get_timeout(). After each I/O polling call the bus connection needs to process incoming or outgoing data, by invoking sd_bus_process3. diff --git a/man/systemctl.xml b/man/systemctl.xml index 36495cbd33..6dc7cd66f3 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -2100,8 +2100,8 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err When used with the reboot command, indicate to the system's boot loader to show the - boot loader menu on the following boot. Takes a time value as parameter — indicating the menu time-out. Pass - zero in order to disable the menu time-out. Note that not all boot loaders support this + boot loader menu on the following boot. Takes a time value as parameter — indicating the menu timeout. Pass + zero in order to disable the menu timeout. Note that not all boot loaders support this functionality. diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 8f57cc8bfb..f5db55511f 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -1098,8 +1098,8 @@ StateDirectory=aaa/bbb ccc clean …, see systemctl1 for details. Takes the usual time values and defaults to infinity, i.e. by default - no time-out is applied. If a time-out is configured the clean operation will be aborted forcibly when - the time-out is reached, potentially leaving resources on disk. + no timeout is applied. If a timeout is configured the clean operation will be aborted forcibly when + the timeout is reached, potentially leaving resources on disk. diff --git a/src/home/home-util.h b/src/home/home-util.h index 78d6e7b417..6161d4c3d0 100644 --- a/src/home/home-util.h +++ b/src/home/home-util.h @@ -19,7 +19,7 @@ int split_user_name_realm(const char *t, char **ret_user_name, char **ret_realm) int bus_message_append_secret(sd_bus_message *m, UserRecord *secret); /* Many of our operations might be slow due to crypto, fsck, recursive chown() and so on. For these - * operations permit a *very* long time-out */ + * operations permit a *very* long timeout */ #define HOME_SLOW_BUS_CALL_TIMEOUT_USEC (2*USEC_PER_MINUTE) int test_password_one(const char *hashed_password, const char *password); diff --git a/src/home/homework-luks.c b/src/home/homework-luks.c index e9b2fc0c0d..2a782e34bc 100644 --- a/src/home/homework-luks.c +++ b/src/home/homework-luks.c @@ -1718,7 +1718,7 @@ static int wait_for_devlink(const char *path) { usec_t until; int r; - /* let's wait for a device link to show up in /dev, with a time-out. This is good to do since we + /* let's wait for a device link to show up in /dev, with a timeout. This is good to do since we * return a /dev/disk/by-uuid/… link to our callers and they likely want to access it right-away, * hence let's wait until udev has caught up with our changes, and wait for the symlink to be * created. */ diff --git a/src/shared/nscd-flush.c b/src/shared/nscd-flush.c index 33a06a010c..10fdbaf326 100644 --- a/src/shared/nscd-flush.c +++ b/src/shared/nscd-flush.c @@ -134,7 +134,7 @@ int nscd_flush_cache(char **databases) { int r = 0; char **i; - /* Tries to invalidate the specified database in nscd. We do this carefully, with a 5s time-out, so that we + /* Tries to invalidate the specified database in nscd. We do this carefully, with a 5s timeout, so that we * don't block indefinitely on another service. */ end = usec_add(now(CLOCK_MONOTONIC), NSCD_FLUSH_CACHE_TIMEOUT_USEC); diff --git a/units/systemd-random-seed.service.in b/units/systemd-random-seed.service.in index c64e8a9091..f97f99a966 100644 --- a/units/systemd-random-seed.service.in +++ b/units/systemd-random-seed.service.in @@ -26,5 +26,5 @@ ExecStop=@rootlibexecdir@/systemd-random-seed save # This service waits until the kernel's entropy pool is initialized, and may be # used as ordering barrier for service that require an initialized entropy # pool. Since initialization can take a while on entropy-starved systems, let's -# increase the time-out substantially here. +# increase the timeout substantially here. TimeoutSec=10min