diff options
author | Dimitri Staessens <dimitri.staessens@ugent.be> | 2018-06-13 13:18:10 +0200 |
---|---|---|
committer | Sander Vrijders <sander.vrijders@ugent.be> | 2018-06-13 13:39:55 +0200 |
commit | 47c922f1360990f2da8363aafa0798551a2128ef (patch) | |
tree | 8009e3a2bc692ae279bdc140a931b4baae927a25 /src/lib | |
parent | 39e0358161212c5d662208360c1fdcb68ee6b64a (diff) | |
download | ouroboros-47c922f1360990f2da8363aafa0798551a2128ef.tar.gz ouroboros-47c922f1360990f2da8363aafa0798551a2128ef.zip |
lib: Use macros for all time utility functions0.11.9
This replaces the time utility functions with macros. This avoids
using library functions in the tools and also slightly speeds up the
implementation.
Signed-off-by: Dimitri Staessens <dimitri.staessens@ugent.be>
Signed-off-by: Sander Vrijders <sander.vrijders@ugent.be>
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/lib/time_utils.c | 144 |
2 files changed, 0 insertions, 145 deletions
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 973c2458..e7e07802 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -206,7 +206,6 @@ set(SOURCE_FILES_COMMON shm_rbuff.c shm_rdrbuff.c sockets.c - time_utils.c tpm.c utils.c ) diff --git a/src/lib/time_utils.c b/src/lib/time_utils.c deleted file mode 100644 index 0701e2d3..00000000 --- a/src/lib/time_utils.c +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Ouroboros - Copyright (C) 2016 - 2018 - * - * Time utilities - * - * Dimitri Staessens <dimitri.staessens@ugent.be> - * Sander Vrijders <sander.vrijders@ugent.be> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., http://www.fsf.org/about/contact/. - */ - -#define _POSIX_C_SOURCE 199309L - -#include <ouroboros/time_utils.h> -#include <stddef.h> - -/* functions for timespecs */ - -/* add intv to t and store it in res*/ -int ts_add(const struct timespec * t, - const struct timespec * intv, - struct timespec * res) -{ - time_t nanos = 0; - - if (t == NULL || intv == NULL || res == NULL) - return -1; - - nanos = t->tv_nsec + intv->tv_nsec; - - res->tv_sec = t->tv_sec + intv->tv_sec; - while (nanos >= BILLION) { - nanos -= BILLION; - ++(res->tv_sec); - } - - res->tv_nsec = nanos; - - return 0; -} - -/* subtract intv from t and stores it in res */ -int ts_diff(const struct timespec * t, - const struct timespec * intv, - struct timespec * res) -{ - time_t nanos = 0; - - if (t == NULL || intv == NULL || res == NULL) - return -1; - - nanos = t->tv_nsec - intv->tv_nsec; - - res->tv_sec = t->tv_sec - intv->tv_sec; - while (nanos < 0) { - nanos += BILLION; - --(res->tv_sec); - } - res->tv_nsec = nanos; - - return 0; -} - -/* functions for timevals */ - -/* add intv to t and store it in res*/ -int tv_add(const struct timeval * t, - const struct timeval * intv, - struct timeval * res) -{ - time_t micros = 0; - - if (t == NULL || intv == NULL || res == NULL) - return -1; - - micros = t->tv_usec + intv->tv_usec; - - res->tv_sec = t->tv_sec + intv->tv_sec; - while (micros >= MILLION) { - micros -= MILLION; - ++(res->tv_sec); - } - res->tv_usec = micros; - - return 0; -} - -/* subtract intv from t and stores it in res */ -int tv_diff(const struct timeval * t, - const struct timeval * intv, - struct timeval * res) -{ - time_t micros = 0; - - if (t == NULL || intv == NULL || res == NULL) - return -1; - - micros = t->tv_usec - intv->tv_usec; - - res->tv_sec = t->tv_sec - intv->tv_sec; - while (micros < 0) { - micros += MILLION; - --(res->tv_sec); - } - res->tv_usec = micros; - - return 0; -} - -int tv_to_ts(const struct timeval * src, - struct timespec * dst) -{ - if (src == NULL || dst == NULL) - return -1; - - dst->tv_sec = src->tv_sec; - dst->tv_nsec = src->tv_usec * 1000L; - - return 0; -} - -/* copying a timespec into a timeval (loss of resolution) */ -int ts_to_tv(const struct timespec * src, - struct timeval * dst) -{ - if (src == NULL || dst == NULL) - return -1; - - dst->tv_sec = src->tv_sec; - dst->tv_usec = src->tv_nsec / 1000L; - - return 0; -} |