SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: use usec_add() and usec_sub_unsigned()

Browse Source
This commit is contained in:
Yu Watanabe
2021-03-05 07:10:08 +09:00
parent e6283cbf48
commit 496db33004
14 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/process-util.c
+1 -1
View File
@@ -756,7 +756,7 @@ int wait_for_terminate_with_timeout(pid_t pid, usec_t timeout) {
/* Drop into a sigtimewait-based timeout. Waiting for the
* pid to exit. */
until = now(CLOCK_MONOTONIC) + timeout;
until = usec_add(now(CLOCK_MONOTONIC), timeout);
for (;;) {
usec_t n;
siginfo_t status = {};
src/basic/ratelimit.c
+1 -1
View File
@@ -19,7 +19,7 @@ bool ratelimit_below(RateLimit *r) {
ts = now(CLOCK_MONOTONIC);
if (r->begin <= 0 ||
ts - r->begin > r->interval) {
usec_sub_unsigned(ts, r->begin) > r->interval) {
r->begin = ts;
/* Reset counter */
src/basic/terminal-util.c
+3 -3
View File
@@ -440,11 +440,11 @@ int acquire_terminal(
assert(ts != USEC_INFINITY);
n = now(CLOCK_MONOTONIC);
if (ts + timeout < n)
n = usec_sub_unsigned(now(CLOCK_MONOTONIC), ts);
if (n >= timeout)
return -ETIMEDOUT;
r = fd_wait_for_event(notify, POLLIN, ts + timeout - n);
r = fd_wait_for_event(notify, POLLIN, usec_sub_unsigned(timeout, n));
if (r < 0)
return r;
if (r == 0)