From 2cadb5a98f2bd1bdf2cb060bb334daf367ca657a Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 2 Dec 2018 02:49:18 +0100 Subject: [PATCH] use better heuristic for compile-time cache line size --- common/include/villas/config.h.in | 7 +++++++ common/lib/kernel/kernel.c | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/common/include/villas/config.h.in b/common/include/villas/config.h.in index e891e2b67..8eb53710f 100644 --- a/common/include/villas/config.h.in +++ b/common/include/villas/config.h.in @@ -57,3 +57,10 @@ /** Width of log output in characters */ #define LOG_WIDTH 80 #define LOG_HEIGHT 25 + +/* Hard-coded cache line size */ +#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) + #define CACHELINE_SIZE 64 +#else + #error "Unsupported architecture" +#endif diff --git a/common/lib/kernel/kernel.c b/common/lib/kernel/kernel.c index 8fa13ce8a..e5fd3b4d7 100644 --- a/common/lib/kernel/kernel.c +++ b/common/lib/kernel/kernel.c @@ -52,10 +52,8 @@ int kernel_get_cacheline_size() pclose(fp); return ret == 1 ? size : -1; -#elif defined(__x86_64__) || defined(__i386__) - return 64; /** @todo fixme */ #else - #error "Unsupported architecture" + return CACHELINE_SIZE; #endif }