Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

fixes for compiling VILLASnode on ARM

Browse source
This commit is contained in:
Steffen Vogel 2018-09-26 22:19:10 +00:00
parent 7dd4fc2f91
commit 15ac4023f5
6 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -62,6 +62,12 @@ else()
add_compile_options(-Wall -Werror)
endif()
execute_process(
COMMAND uname -m
COMMAND tr -d '\n'
OUTPUT_VARIABLE ARCH
)
# Check OS
check_include_file("sys/eventfd.h" HAS_EVENTFD)
check_include_file("semaphore.h" HAS_SEMAPHORE)

4
include/villas/log.h
View file

@ -74,7 +74,7 @@ enum log_facilities {
LOG_WEBSOCKET = (1L << 29),
LOG_OPAL = (1L << 30),
LOG_COMEDI = (1L << 31),
LOG_IB = (1L << 32),
LOG_IB = (1LL << 32),
/* Classes */
LOG_NODES = LOG_NODE | LOG_SOCKET | LOG_FILE | LOG_FPGA | LOG_NGSI | LOG_WEBSOCKET | LOG_OPAL | LOG_IB,
@ -148,7 +148,7 @@ void log_print(struct log *l, const char *lvl, const char *fmt, ...)
void log_vprint(struct log *l, const char *lvl, const char *fmt, va_list va);
/** Printf alike debug message with level. */
void debug(long lvl, const char *fmt, ...)
void debug(long long lvl, const char *fmt, ...)
__attribute__ ((format(printf, 2, 3)));
/** Printf alike info message. */

6
lib/CMakeLists.txt
View file

@ -73,9 +73,13 @@ set(LIB_SRC
table.c
bitset.c
signal.c
tsc.c
)
if(ARCH STREQUAL "x86_64")
list(APPEND LIB_SRC tsc.c)
endif()
if(IBVERBS_FOUND AND RDMACM_FOUND)
list(APPEND LIB_SRC memory/ib.c)
endif()

2
lib/log.c
View file

@ -216,7 +216,7 @@ int log_set_facility_expression(struct log *l, const char *expression)
{
bool negate;
char *copy, *token;
long mask = 0, facilities = 0;
long long mask = 0, facilities = 0;
copy = strdup(expression);
token = strtok(copy, ",");

2
lib/memory.c
View file

@ -85,7 +85,7 @@ int memory_init(int hugepages)
if (l.rlim_cur < lock) {
if (l.rlim_max < lock) {
if (getuid() != 0) {
warn("Failed to in increase ressource limit of locked memory from %zu to %zu bytes", l.rlim_cur, lock);
warn("Failed to in increase ressource limit of locked memory from %lu to %zu bytes", l.rlim_cur, lock);
warn("Please re-run as super-user or raise manually via:");
warn(" $ ulimit -Hl %zu", lock);

2
lib/queue.c
View file

@ -44,7 +44,7 @@ int queue_init(struct queue *q, size_t size, struct memory_type *m)
if (!IS_POW2(size)) {
size_t old_size = size;
size = LOG2_CEIL(size);
warn("A queue size was changed from %lu to %lu", old_size, size);
warn("A queue size was changed from %zu to %zu", old_size, size);
}
q->buffer_mask = size - 1;