From 170c86dca42f21a1dee0e1e7b1f4dd9209b0182f Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 2 Aug 2018 10:45:15 +0200 Subject: [PATCH] refactor: - WEBSOCKET_DEFAULT_SAMPLELEN -> WEBSOCKET_DEFAULT_SAMPLE_LENGTH - WEBSOCKET_DEFAULT_QUEUELEN -> WEBSOCKET_DEFAULT_QUEUE_LENGTH --- include/villas/nodes/websocket.h | 4 ++-- lib/nodes/websocket.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/villas/nodes/websocket.h b/include/villas/nodes/websocket.h index ec6a0600c..2016ba23f 100644 --- a/include/villas/nodes/websocket.h +++ b/include/villas/nodes/websocket.h @@ -40,8 +40,8 @@ extern "C" { #endif -#define DEFAULT_WEBSOCKET_QUEUELEN (DEFAULT_QUEUE_LENGTH * 64) -#define DEFAULT_WEBSOCKET_SAMPLELEN DEFAULT_SAMPLE_LENGTH +#define DEFAULT_WEBSOCKET_QUEUE_LENGTH (DEFAULT_QUEUE_LENGTH * 64) +#define DEFAULT_WEBSOCKET_SAMPLE_LENGTH DEFAULT_SAMPLE_LENGTH /* Forward declaration */ struct lws; diff --git a/lib/nodes/websocket.c b/lib/nodes/websocket.c index 1e2dd4cef..12aba03fa 100644 --- a/lib/nodes/websocket.c +++ b/lib/nodes/websocket.c @@ -402,11 +402,11 @@ int websocket_start(struct node *n) int ret; struct websocket *w = (struct websocket *) n->_vd; - ret = pool_init(&w->pool, DEFAULT_WEBSOCKET_QUEUELEN, SAMPLE_LENGTH(DEFAULT_WEBSOCKET_SAMPLELEN), &memory_hugepage); + ret = pool_init(&w->pool, DEFAULT_WEBSOCKET_QUEUE_LENGTH, SAMPLE_LENGTH(DEFAULT_WEBSOCKET_SAMPLE_LENGTH), &memory_hugepage); if (ret) return ret; - ret = queue_signalled_init(&w->queue, DEFAULT_WEBSOCKET_QUEUELEN, &memory_hugepage, 0); + ret = queue_signalled_init(&w->queue, DEFAULT_WEBSOCKET_QUEUE_LENGTH, &memory_hugepage, 0); if (ret) return ret;