Initialization utilities for nstime

This commit is contained in:
Yinan Zhang
2019-12-16 12:41:06 -08:00
parent dd649c9485
commit 1d01e4c770
12 changed files with 46 additions and 41 deletions

View File

@@ -2,8 +2,7 @@
void
timer_start(timedelta_t *timer) {
nstime_init(&timer->t0, 0);
nstime_update(&timer->t0);
nstime_init_update(&timer->t0);
}
void

View File

@@ -83,9 +83,8 @@ TEST_BEGIN(test_background_thread_running) {
assert_b_eq(info->state, background_thread_started,
"Background_thread did not start.\n");
nstime_t start, now;
nstime_init(&start, 0);
nstime_update(&start);
nstime_t start;
nstime_init_update(&start);
bool ran = false;
while (true) {
@@ -98,8 +97,8 @@ TEST_BEGIN(test_background_thread_running) {
break;
}
nstime_init(&now, 0);
nstime_update(&now);
nstime_t now;
nstime_init_update(&now);
nstime_subtract(&now, &start);
assert_u64_lt(nstime_sec(&now), 1000,
"Background threads did not run for 1000 seconds.");

View File

@@ -384,8 +384,7 @@ decay_ticker_helper(unsigned arena_ind, int flags, bool dirty, ssize_t dt,
#define NINTERVALS 101
nstime_t time, update_interval, decay_ms, deadline;
nstime_init(&time, 0);
nstime_update(&time);
nstime_init_update(&time);
nstime_init2(&decay_ms, dt, 0);
nstime_copy(&deadline, &time);
@@ -456,8 +455,7 @@ TEST_BEGIN(test_decay_ticker) {
}
nupdates_mock = 0;
nstime_init(&time_mock, 0);
nstime_update(&time_mock);
nstime_init_update(&time_mock);
monotonic_mock = true;
nstime_monotonic_orig = nstime_monotonic;
@@ -507,8 +505,7 @@ TEST_BEGIN(test_decay_nonmonotonic) {
npurge0 = get_arena_npurge(0);
nupdates_mock = 0;
nstime_init(&time_mock, 0);
nstime_update(&time_mock);
nstime_init_update(&time_mock);
monotonic_mock = false;
nstime_monotonic_orig = nstime_monotonic;

View File

@@ -25,7 +25,7 @@ TEST_BEGIN(test_nstime_copy) {
nstime_t nsta, nstb;
nstime_init2(&nsta, 42, 43);
nstime_init(&nstb, 0);
nstime_init_zero(&nstb);
nstime_copy(&nstb, &nsta);
assert_u64_eq(nstime_sec(&nstb), 42, "sec incorrectly copied");
assert_u64_eq(nstime_nsec(&nstb), 43, "nsec incorrectly copied");
@@ -108,7 +108,7 @@ TEST_BEGIN(test_nstime_subtract) {
nstime_init2(&nsta, 42, 43);
nstime_copy(&nstb, &nsta);
nstime_subtract(&nsta, &nstb);
nstime_init(&nstb, 0);
nstime_init_zero(&nstb);
assert_d_eq(nstime_compare(&nsta, &nstb), 0,
"Incorrect subtraction result");
@@ -126,7 +126,7 @@ TEST_BEGIN(test_nstime_isubtract) {
nstime_init2(&nsta, 42, 43);
nstime_isubtract(&nsta, 42*BILLION + 43);
nstime_init(&nstb, 0);
nstime_init_zero(&nstb);
assert_d_eq(nstime_compare(&nsta, &nstb), 0,
"Incorrect subtraction result");
@@ -209,9 +209,7 @@ TEST_END
TEST_BEGIN(test_nstime_update) {
nstime_t nst;
nstime_init(&nst, 0);
assert_false(nstime_update(&nst), "Basic time update failed.");
assert_false(nstime_init_update(&nst), "Basic time update failed.");
/* Only Rip Van Winkle sleeps this long. */
{