mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-26 19:53:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

tree-wide: time-out → timeout

Browse Source 
For justification, see 3f9a0a522f.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2024-11-05 18:47:54 +01:00 committed by Luca Boccassi
parent 7af37f3a90
commit 2257be13fe
14 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NEWS
View File

@ -5162,7 +5162,7 @@ CHANGES WITH 250:
* A new kernel command line option systemd.watchdog_sec= is now
understood which may be used to override the hardware watchdog
time-out for the boot.
timeout for the boot.
* A new setting DefaultOOMScoreAdjust= is now supported in
/etc/systemd/system.conf and /etc/systemd/user.conf. It may be used
@ -5222,7 +5222,7 @@ CHANGES WITH 250:
variable passed to invoked processes.
* A new setting RuntimeRandomizedExtraSec= has been added for service
and scope units that allows extending the runtime time-out as
and scope units that allows extending the runtime timeout as
configured by RuntimeMaxSec= with a randomized amount.
* The syntax of the service unit settings RuntimeDirectory=,
@ -5585,7 +5585,7 @@ CHANGES WITH 250:
non-x86 architectures.
* bootctl learnt new set-timeout and set-timeout-oneshot commands that
may be used to set the boot menu time-out of the boot loader (for all
may be used to set the boot menu timeout of the boot loader (for all
or just the subsequent boot).
* bootctl and kernel-install will now read variables

2
man/crypttab.xml
View File

@ -950,7 +950,7 @@
for supported formats). Defaults to 30s. Once the specified timeout elapsed authentication via
password is attempted. Note that this timeout applies to waiting for the security device to show up —
it does not apply to the PIN prompt for the device (should one be needed) or similar. Pass 0 to turn
off the time-out and wait forever.</para>
off the timeout and wait forever.</para>
<xi:include href="version-info.xml" xpointer="v250"/></listitem>
</varlistentry>

4
man/sd_bus_get_fd.xml
View File

@ -66,8 +66,8 @@
<constant>POLLIN</constant>, <constant>POLLOUT</constant>, … events, or negative on error.
</para>
<para><function>sd_bus_get_timeout()</function> returns the <emphasis>absolute</emphasis> time-out in μs,
from which the relative time-out to pass to <function>poll()</function> (or a similar call) can be
<para><function>sd_bus_get_timeout()</function> returns the <emphasis>absolute</emphasis> timeout in μs,
from which the relative timeout to pass to <function>poll()</function> (or a similar call) can be
derived, when waiting for events on the specified bus 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 <constant>UINT64_MAX</constant> in which case the I/O polling call may block indefinitely, without any

2
man/sd_bus_pending_method_calls.xml
View File

@ -40,7 +40,7 @@
<para><function>sd_bus_pending_method_calls()</function> returns the number of currently pending outgoing
method calls, i.e. method calls enqueued with
<citerefentry><refentrytitle>sd_bus_call_async</refentrytitle><manvolnum>3</manvolnum></citerefentry> for
which no reply has been received yet, and which have not reached a time-out yet.</para>
which no reply has been received yet, and which have not reached a timeout yet.</para>
<para>The <parameter>bus</parameter> argument may be <constant>NULL</constant>, in which case zero is
returned.</para>

2
man/sd_event_exit.xml
View File

@ -83,7 +83,7 @@
<citerefentry><refentrytitle>sd_event_add_signal</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
…) has the effect of <function>sd_event_exit()</function> being invoked once the event source triggers,
with the specified userdata pointer cast to an integer as the exit code parameter. This is useful to
automatically terminate an event loop after some condition, such as a time-out or reception of
automatically terminate an event loop after some condition, such as a timeout or reception of
<constant>SIGTERM</constant> or similar. See the documentation for the respective constructor call for
details.</para>
</refsect1>

16
man/varlinkctl.xml
View File

@ -202,19 +202,19 @@
<listitem><para>When used with <command>call</command>: expect multiple method replies. If this flag
is set the method call is sent with the <constant>more</constant> flag set, which tells the service
to generate multiple replies, if needed. The command remains running until the service sends a reply
message that indicates it is the last in the series (or if the configured time-out is reached, see
message that indicates it is the last in the series (or if the configured timeout is reached, see
below). This flag should be set only for method calls that support this mechanism.</para>
<para>If this mode is enabled output is automatically switched to JSON-SEQ mode, so that individual
reply objects can be easily discerned.</para>
<para>This switch has no effect on the method call time-out applied by default: regardless if
<option>--more</option> is specified or not, the default time-out will be 45s. Use
<option>--timeout=</option> (see below) to change or disable the time-out. When invoking a method
call that continuously returns updates it is typically desirable to disable the time-out with
<para>This switch has no effect on the method call timeout applied by default: regardless if
<option>--more</option> is specified or not, the default timeout will be 45s. Use
<option>--timeout=</option> (see below) to change or disable the timeout. When invoking a method
call that continuously returns updates it is typically desirable to disable the timeout with
<option>--timeout=infinity</option>. On the other hand, when invoking a <option>--more</option>
method call for the purpose of enumerating objects (which likely will complete quickly) it is
typically beneficial to leave the time-out logic enabled, for robustness reasons.</para>
typically beneficial to leave the timeout logic enabled, for robustness reasons.</para>
<xi:include href="version-info.xml" xpointer="v255"/></listitem>
</varlistentry>
@ -300,8 +300,8 @@
<term><option>--timeout=</option></term>
<listitem>
<para>Expects a time-out in seconds as parameter. By default a time-out of 45s is enforced. To turn
off the time-out specify <literal>infinity</literal> or an empty string.</para>
<para>Expects a timeout in seconds as parameter. By default a timeout of 45s is enforced. To turn
off the timeout specify <literal>infinity</literal> or an empty string.</para>
<xi:include href="version-info.xml" xpointer="v257"/>
</listitem>

4
src/basic/lock-util.c
View File

@ -203,9 +203,9 @@ int lock_generic_with_timeout(int fd, LockType type, int operation, usec_t timeo
assert(fd >= 0);
/* A version of lock_generic(), but with a time-out. We do this in a child process, since the kernel
/* A version of lock_generic(), but with a timeout. We do this in a child process, since the kernel
* APIs natively don't support a timeout. We set a SIGALRM timer that will kill the child after the
* timeout is hit. Returns -ETIMEDOUT if the time-out is hit, and 0 on success.
* timeout is hit. Returns -ETIMEDOUT if the timeout is hit, and 0 on success.
*
* This only works for BSD and UNPOSIX locks, as only those are fd-bound, and hence can be acquired
* from any process that has access to the fd. POSIX locks OTOH are process-bound, and hence if we'd

2
src/core/service.c
View File

@ -4736,7 +4736,7 @@ static void service_notify_message(
monotonic_usec != USEC_INFINITY &&
monotonic_usec >= s->reload_begin_usec)
/* Note, we don't call service_enter_reload_by_notify() here, because we
* don't need reload propagation nor do we want to restart the time-out. */
* don't need reload propagation nor do we want to restart the timeout. */
service_set_state(s, SERVICE_RELOAD_NOTIFY);
if (s->state == SERVICE_RUNNING)

2
src/cryptsetup/cryptsetup.c
View File

@ -1294,7 +1294,7 @@ static int run_security_device_monitor(
assert(event);
assert(monitor);
/* Runs the event loop for the device monitor until either something happens, or the time-out is
/* Runs the event loop for the device monitor until either something happens, or the timeout is
* hit. */
for (;;) {

2
src/libsystemd/sd-event/sd-event.c
View File

@ -4573,7 +4573,7 @@ static int epoll_wait_usec(
/* epoll_pwait2() was added to Linux 5.11 (2021-02-14) and to glibc in 2.35 (2022-02-03). In contrast
* to other syscalls we don't bother with our own fallback syscall wrappers on old libcs, since this
* is not that obvious to implement given the libc and kernel definitions differ in the last
* argument. Moreover, the only reason to use it is the more accurate time-outs (which is not a
* argument. Moreover, the only reason to use it is the more accurate timeouts (which is not a
* biggie), let's hence rely on glibc's definitions, and fallback to epoll_pwait() when that's
* missing. */

2
src/network/networkd-ndisc.c
View File

@ -1278,7 +1278,7 @@ static int ndisc_router_process_onlink_prefix(Link *link, sd_ndisc_router *rt) {
*
* - If the prefix is already present in the host's Prefix List as the result of a previously
* received advertisement, reset its invalidation timer to the Valid Lifetime value in the Prefix
* Information option. If the new Lifetime value is zero, time-out the prefix immediately. */
* Information option. If the new Lifetime value is zero, timeout the prefix immediately. */
if (lifetime_usec == 0) {
r = ndisc_remove_route(route, link);
if (r < 0)

2
src/resolve/resolvectl.c
View File

@ -3010,7 +3010,7 @@ static int verb_monitor(int argc, char *argv[], void *userdata) {
r = sd_varlink_set_relative_timeout(vl, USEC_INFINITY); /* We want the monitor to run basically forever */
if (r < 0)
return log_error_errno(r, "Failed to set varlink time-out: %m");
return log_error_errno(r, "Failed to set varlink timeout: %m");
r = sd_varlink_attach_event(vl, event, SD_EVENT_PRIORITY_NORMAL);
if (r < 0)

2
src/resolve/resolved-dns-scope.c
View File

@ -1744,7 +1744,7 @@ int dns_type_suitable_for_protocol(uint16_t type, DnsProtocol protocol) {
/* Tests whether it makes sense to route queries for the specified DNS RR types to the specified
* protocol. For classic DNS pretty much all RR types are suitable, but for LLMNR/mDNS let's
* allowlist only a few that make sense. We use this when routing queries so that we can more quickly
* return errors for queries that will almost certainly fail/time-out otherwise. For example, this
* return errors for queries that will almost certainly fail/time out otherwise. For example, this
* ensures that SOA, NS, or DS/DNSKEY queries are never routed to mDNS/LLMNR where they simply make
* no sense. */

2
src/resolve/resolved-dns-stream.h
View File

@ -15,7 +15,7 @@ typedef struct DnsStubListenerExtra DnsStubListenerExtra;
#include "resolved-dns-packet.h"
#include "resolved-dnstls.h"
/* Various timeouts for establishing TCP connections. First the default time-out for that. */
/* Various timeouts for establishing TCP connections. First the default timeout for that. */
#define DNS_STREAM_DEFAULT_TIMEOUT_USEC (10 * USEC_PER_SEC)
/* In the DNS stub, be more friendly for incoming connections, than we are to ourselves for outgoing ones */