diff options
author | David M. Lee <dlee@respoke.io> | 2015-07-24 17:04:35 -0500 |
---|---|---|
committer | David M. Lee <dlee@respoke.io> | 2015-08-07 19:35:13 -0500 |
commit | 40caf0ad9bef07bdfb568a88192c157dd1840100 (patch) | |
tree | 01d1e4f6745b5eeaeb607e5bb85a2884a6ff9087 /tests | |
parent | 309dd2a4090ccdd1ea31d8d5415a645daddd3883 (diff) |
Replaces clock_gettime() with ast_tsnow()
clock_gettime() is, unfortunately, not portable. But I did like that
over our usual `ts.tv_nsec = tv.tv_usec * 1000` copy/paste code we
usually do when we want a timespec and all we have is ast_tvnow().
This patch adds ast_tsnow(), which mimics ast_tvnow(), but returns a
timespec. If clock_gettime() is available, it will use that. Otherwise
ast_tsnow() falls back to using ast_tvnow().
Change-Id: Ibb1ee67ccf4826b9b76d5a5eb62e90b29b6c456e
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test_dns.c | 6 | ||||
-rw-r--r-- | tests/test_dns_query_set.c | 2 | ||||
-rw-r--r-- | tests/test_dns_recurring.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/test_dns.c b/tests/test_dns.c index 4e2c4a464..718cffc50 100644 --- a/tests/test_dns.c +++ b/tests/test_dns.c @@ -694,7 +694,7 @@ static void *resolution_thread(void *dns_query) static const size_t V4_BUFSIZE = sizeof(struct in_addr); char v4_buf[V4_BUFSIZE]; - clock_gettime(CLOCK_REALTIME, &timeout); + timeout = ast_tsnow(); timeout.tv_sec += 5; ast_mutex_lock(&test_resolver_data.lock); @@ -1089,7 +1089,7 @@ AST_TEST_DEFINE(resolver_resolve_async) goto cleanup; } - clock_gettime(CLOCK_REALTIME, &timeout); + timeout = ast_tsnow(); timeout.tv_sec += 10; ast_mutex_lock(&async_data->lock); while (!async_data->complete) { @@ -1279,7 +1279,7 @@ AST_TEST_DEFINE(resolver_resolve_async_cancel) goto cleanup; } - clock_gettime(CLOCK_REALTIME, &timeout); + timeout = ast_tsnow(); timeout.tv_sec += 10; ast_mutex_lock(&async_data->lock); while (!async_data->complete) { diff --git a/tests/test_dns_query_set.c b/tests/test_dns_query_set.c index 98a6051db..aeb61c767 100644 --- a/tests/test_dns_query_set.c +++ b/tests/test_dns_query_set.c @@ -245,7 +245,7 @@ static enum ast_test_result_state query_set_test(struct ast_test *test, int reso } } - clock_gettime(CLOCK_REALTIME, &timeout); + timeout = ast_tsnow(); timeout.tv_sec += 10; ast_mutex_lock(&qsdata->lock); diff --git a/tests/test_dns_recurring.c b/tests/test_dns_recurring.c index b5736c22c..d1add6ee1 100644 --- a/tests/test_dns_recurring.c +++ b/tests/test_dns_recurring.c @@ -210,7 +210,7 @@ static int wait_for_resolution(struct ast_test *test, struct recurring_data *rda struct timespec timeout; int secdiff; - clock_gettime(CLOCK_REALTIME, &begin); + begin = ast_tsnow(); timeout.tv_sec = begin.tv_sec + 20; timeout.tv_nsec = begin.tv_nsec; @@ -229,7 +229,7 @@ static int wait_for_resolution(struct ast_test *test, struct recurring_data *rda } rdata->query_complete = 0; - clock_gettime(CLOCK_REALTIME, &end); + end = ast_tsnow(); secdiff = end.tv_sec - begin.tv_sec; @@ -504,7 +504,7 @@ AST_TEST_DEFINE(recurring_query_cancel_between) /* Query has been canceled, so let's wait to make sure that we don't get * told another query has occurred. */ - clock_gettime(CLOCK_REALTIME, &timeout); + timeout = ast_tsnow(); timeout.tv_sec += 10; ast_mutex_lock(&rdata->lock); @@ -602,7 +602,7 @@ AST_TEST_DEFINE(recurring_query_cancel_during) } /* Now ensure that no more queries get completed after cancellation. */ - clock_gettime(CLOCK_REALTIME, &timeout); + timeout = ast_tsnow(); timeout.tv_sec += 10; ast_mutex_lock(&rdata->lock); |