summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/tests/CMakeLists.txt1
-rw-r--r--src/lib/tests/time_utils_test.c164
-rw-r--r--src/lib/time_utils.c14
3 files changed, 173 insertions, 6 deletions
diff --git a/src/lib/tests/CMakeLists.txt b/src/lib/tests/CMakeLists.txt
index 71131929..46a3e91f 100644
--- a/src/lib/tests/CMakeLists.txt
+++ b/src/lib/tests/CMakeLists.txt
@@ -10,6 +10,7 @@ create_test_sourcelist(${PARENT_DIR}_tests test_suite.c
md5_test.c
rib_test.c
sha3_test.c
+ time_utils_test.c
)
add_executable(${PARENT_DIR}_test EXCLUDE_FROM_ALL ${${PARENT_DIR}_tests})
diff --git a/src/lib/tests/time_utils_test.c b/src/lib/tests/time_utils_test.c
new file mode 100644
index 00000000..6d1ae32f
--- /dev/null
+++ b/src/lib/tests/time_utils_test.c
@@ -0,0 +1,164 @@
+/*
+ * Ouroboros - Copyright (C) 2016 - 2017
+ *
+ * Test of the time utilities
+ *
+ * Dimitri Staessens <dimitri.staessens@ugent.be>
+ * Sander Vrijders <sander.vrijders@ugent.be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#define _POSIX_C_SOURCE 200809L
+
+#include <ouroboros/time_utils.h>
+
+#include <stdio.h>
+
+static void ts_print(struct timespec * s)
+{
+ printf("timespec is %zd:%zd.\n", s->tv_sec, s->tv_nsec);
+}
+
+static void tv_print(struct timeval * v)
+{
+ printf("timeval is %zd:%zd.\n", v->tv_sec, v->tv_usec);
+}
+
+static void ts_init(struct timespec * s,
+ time_t sec,
+ time_t nsec)
+{
+ s->tv_sec = sec;
+ s->tv_nsec = nsec;
+}
+
+static void tv_init(struct timeval * v,
+ time_t sec,
+ time_t usec)
+{
+ v->tv_sec = sec;
+ v->tv_usec = usec;
+}
+
+static int ts_check(struct timespec * s,
+ time_t sec,
+ time_t nsec)
+{
+ return s->tv_sec == sec && s->tv_nsec == nsec;
+}
+
+static int tv_check(struct timeval * v,
+ time_t sec,
+ time_t usec)
+{
+ return v->tv_sec == sec && v->tv_usec == usec;
+}
+
+int time_utils_test(int argc,
+ char ** argv)
+{
+ struct timespec s0;
+ struct timespec s1;
+ struct timespec s2;
+
+ struct timeval v0;
+ struct timeval v1;
+ struct timeval v2;
+
+ (void) argc;
+ (void) argv;
+
+ ts_init(&s0, 0, 0);
+ ts_init(&s1, 5, 0);
+
+ ts_add(&s0, &s1, &s2);
+ if (!ts_check(&s2, 5, 0)) {
+ printf("ts_add failed.\n");
+ ts_print(&s2);
+ return -1;
+ }
+
+ tv_init(&v0, 0, 0);
+ tv_init(&v1, 5, 0);
+
+ tv_add(&v0, &v1, &v2);
+ if (!tv_check(&v2, 5, 0)) {
+ printf("tv_add failed.\n");
+ tv_print(&v2);
+ return -1;
+ }
+
+ ts_init(&s0, 0, 500 * MILLION);
+ ts_init(&s1, 0, 600 * MILLION);
+
+ ts_add(&s0, &s1, &s2);
+ if (!ts_check(&s2, 1, 100 * MILLION)) {
+ printf("ts_add with nano overflow failed.\n");
+ ts_print(&s2);
+ return -1;
+ }
+
+ tv_init(&v0, 0, 500 * 1000);
+ tv_init(&v1, 0, 600 * 1000);
+
+ tv_add(&v0, &v1, &v2);
+ if (!tv_check(&v2, 1, 100 * 1000)) {
+ printf("tv_add with nano overflow failed.\n");
+ tv_print(&v2);
+ return -1;
+ }
+
+ ts_init(&s0, 0, 0);
+ ts_init(&s1, 5, 0);
+
+ ts_diff(&s0, &s1, &s2);
+ if (!ts_check(&s2, -5, 0)) {
+ printf("ts_diff failed.\n");
+ ts_print(&s2);
+ return -1;
+ }
+
+ tv_init(&v0, 0, 0);
+ tv_init(&v1, 5, 0);
+
+ tv_diff(&v0, &v1, &v2);
+ if (!tv_check(&v2, -5, 0)) {
+ printf("tv_diff failed.\n");
+ tv_print(&v2);
+ return -1;
+ }
+
+ ts_init(&s0, 0, 500 * MILLION);
+ ts_init(&s1, 0, 600 * MILLION);
+
+ ts_diff(&s0, &s1, &s2);
+ if (!ts_check(&s2, -1, 900 * MILLION)) {
+ printf("ts_diff with nano underflow failed.\n");
+ ts_print(&s2);
+ return -1;
+ }
+
+ tv_init(&v0, 0, 500 * 1000);
+ tv_init(&v1, 0, 600 * 1000);
+
+ tv_diff(&v0, &v1, &v2);
+ if (!tv_check(&v2, -1, 900 * 1000)) {
+ printf("tv_diff with nano underflow failed.\n");
+ tv_print(&v2);
+ return -1;
+ }
+
+ return 0;
+}
diff --git a/src/lib/time_utils.c b/src/lib/time_utils.c
index 97e97b09..07994af2 100644
--- a/src/lib/time_utils.c
+++ b/src/lib/time_utils.c
@@ -32,7 +32,7 @@ int ts_add(const struct timespec * t,
const struct timespec * intv,
struct timespec * res)
{
- long nanos = 0;
+ time_t nanos = 0;
if (t == NULL || intv == NULL || res == NULL)
return -1;
@@ -44,6 +44,7 @@ int ts_add(const struct timespec * t,
nanos -= BILLION;
++(res->tv_sec);
}
+
res->tv_nsec = nanos;
return 0;
@@ -54,7 +55,7 @@ int ts_diff(const struct timespec * t,
const struct timespec * intv,
struct timespec * res)
{
- long nanos = 0;
+ time_t nanos = 0;
if (t == NULL || intv == NULL || res == NULL)
return -1;
@@ -78,7 +79,7 @@ int tv_add(const struct timeval * t,
const struct timeval * intv,
struct timeval * res)
{
- long micros = 0;
+ time_t micros = 0;
if (t == NULL || intv == NULL || res == NULL)
return -1;
@@ -88,7 +89,7 @@ int tv_add(const struct timeval * t,
res->tv_sec = t->tv_sec + intv->tv_sec;
while (micros >= MILLION) {
micros -= MILLION;
- --(res->tv_sec);
+ ++(res->tv_sec);
}
res->tv_usec = micros;
@@ -100,7 +101,7 @@ int tv_diff(const struct timeval * t,
const struct timeval * intv,
struct timeval * res)
{
- long micros = 0;
+ time_t micros = 0;
if (t == NULL || intv == NULL || res == NULL)
return -1;
@@ -143,7 +144,8 @@ int ts_to_tv(const struct timespec * src,
}
#ifdef __APPLE__
-int clock_gettime(int clock, struct timespec * t)
+int clock_gettime(int clock,
+ struct timespec * t)
{
struct timeval tv;
int ret = gettimeofday(&tv, NULL);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 19:16:09 +0000