From a87799404a8c393586d91c72d8164f3bd46444c4 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 2 Jun 2015 22:06:15 +0200 Subject: [PATCH] fix: missing includes --- server/include/utils.h | 14 -------------- server/src/log.c | 3 ++- server/src/random.c | 1 + server/src/receive.c | 1 + server/src/send.c | 1 + server/src/test.c | 2 ++ 6 files changed, 7 insertions(+), 15 deletions(-) diff --git a/server/include/utils.h b/server/include/utils.h index fcb3f1ce6..8ffadbb8a 100644 --- a/server/include/utils.h +++ b/server/include/utils.h @@ -16,7 +16,6 @@ #include #include #include -#include #include #include "log.h" @@ -114,19 +113,6 @@ cpu_set_t to_cpu_set(int set); /** Allocate and initialize memory. */ void * alloc(size_t bytes); -/** Wait until timer elapsed - * - * @retval 0 An error occured. Maybe the timer was stopped. - * @retval >0 The nummer of runs this timer already fired. - */ -uint64_t timerfd_wait(int fd); - -/** Get delta between two timespec structs */ -double timespec_delta(struct timespec *start, struct timespec *end); - -/** Get period as timespec from rate */ -struct timespec timespec_rate(double rate); - /** A system(2) emulator with popen / pclose(2) and proper output handling */ int system2(const char* cmd, ...); diff --git a/server/src/log.c b/server/src/log.c index ca9f41ed6..98976d362 100644 --- a/server/src/log.c +++ b/server/src/log.c @@ -12,6 +12,7 @@ #include "log.h" #include "utils.h" #include "config.h" +#include "timing.h" #ifdef ENABLE_OPAL_ASYNC /* Define RTLAB before including OpalPrint.h for messages to be sent @@ -73,7 +74,7 @@ void log_vprint(const char *lvl, const char *fmt, va_list ap) /* Timestamp */ clock_gettime(CLOCK_REALTIME, &ts); - strap(buf, sizeof(buf), "%10.3f ", timespec_delta(&epoch, &ts)); + strap(buf, sizeof(buf), "%10.3f ", time_delta(&epoch, &ts)); /* Severity */ strap(buf, sizeof(buf), BLD("%5s "), lvl); diff --git a/server/src/random.c b/server/src/random.c index 958c7670c..f598745a7 100644 --- a/server/src/random.c +++ b/server/src/random.c @@ -18,6 +18,7 @@ #include "config.h" #include "utils.h" #include "msg.h" +#include "timing.h" #define CLOCKID CLOCK_REALTIME diff --git a/server/src/receive.c b/server/src/receive.c index 204c12dd2..1556cc912 100644 --- a/server/src/receive.c +++ b/server/src/receive.c @@ -28,6 +28,7 @@ #include "node.h" #include "msg.h" #include "socket.h" +#include "timing.h" /** Linked list of nodes */ struct list nodes; diff --git a/server/src/send.c b/server/src/send.c index 1cec8030d..bf7bd186a 100644 --- a/server/src/send.c +++ b/server/src/send.c @@ -29,6 +29,7 @@ #include "node.h" #include "msg.h" #include "socket.h" +#include "timing.h" /** Linked list of nodes */ struct list nodes; diff --git a/server/src/test.c b/server/src/test.c index 382621855..369b0f4d3 100644 --- a/server/src/test.c +++ b/server/src/test.c @@ -25,6 +25,8 @@ #include "node.h" #include "utils.h" #include "hist.h" +#include "timing.h" + /** Linked list of nodes */ struct list nodes; /** The global configuration */