shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

Merge pull request #18984 from poettering/event-test-timeout

Browse Source 
sd-event: add test for timeout parameter of sd_event_wait()
This commit is contained in:
Luca Boccassi 2021-03-15 14:31:48 +00:00 committed by GitHub
commit 65d325edb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3802,7 +3802,7 @@ static int epoll_wait_usec(
NULL);
if (r >= 0)
return r;
if (!ERRNO_IS_NOT_SUPPORTED(r) && !ERRNO_IS_PRIVILEGE(r))
if (!ERRNO_IS_NOT_SUPPORTED(errno) && !ERRNO_IS_PRIVILEGE(errno))
return -errno; /* Only fallback to old epoll_wait() if the syscall is masked or not
* supported. */

22
src/libsystemd/sd-event/test-event.c
View File

@ -13,6 +13,7 @@
#include "parse-util.h"
#include "path-util.h"
#include "process-util.h"
#include "random-util.h"
#include "rm-rf.h"
#include "signal-util.h"
#include "stdio-util.h"
@ -693,9 +694,30 @@ static void test_ratelimit(void) {
assert_se(count == 20);
}
static void test_simple_timeout(void) {
_cleanup_(sd_event_unrefp) sd_event *e = NULL;
usec_t f, t, some_time;
some_time = random_u64_range(2 * USEC_PER_SEC);
assert_se(sd_event_default(&e) >= 0);
assert_se(sd_event_prepare(e) == 0);
f = now(CLOCK_MONOTONIC);
assert_se(sd_event_wait(e, some_time) >= 0);
t = now(CLOCK_MONOTONIC);
/* The event loop may sleep longer than the specified time (timer accuracy, scheduling latencies, …),
* but never shorter. Let's check that. */
assert_se(t >= usec_add(f, some_time));
}
int main(int argc, char *argv[]) {
test_setup_logging(LOG_DEBUG);
test_simple_timeout();
test_basic(true); /* test with pidfd */
test_basic(false); /* test without pidfd */