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

refactoring: added DEFAULT_WEBSOCKET_{SAMPLE,QUEUE}LEN (like for shmem node-type)

Browse source
This commit is contained in:
Steffen Vogel 2017-04-15 22:50:37 +02:00
parent cee5575861
commit 48ad4f9a56
2 changed files with 8 additions and 5 deletions
include/villas/nodes
websocket.h
lib/nodes
websocket.c

4
include/villas/nodes/websocket.h
View file

@ -22,6 +22,10 @@
#include "pool.h"
#include "queue_signalled.h"
#include "common.h"
#include "config.h"
#define DEFAULT_WEBSOCKET_QUEUELEN (DEFAULT_QUEUELEN * 64)
#define DEFAULT_WEBSOCKET_SAMPLELEN DEFAULT_SAMPLELEN
/* Forward declaration */
struct lws;

9
lib/nodes/websocket.c
View file

@ -16,7 +16,6 @@
#include "webmsg_format.h"
#include "timing.h"
#include "utils.h"
#include "config.h"
#include "plugin.h"
#include "nodes/websocket.h"
@ -57,7 +56,7 @@ static int websocket_connection_init(struct websocket_connection *c, struct lws
else
list_push(&connections, c);
ret = queue_init(&c->queue, DEFAULT_QUEUELEN, &memtype_hugepage);
ret = queue_init(&c->queue, DEFAULT_WEBSOCKET_QUEUELEN, &memtype_hugepage);
if (ret) {
warn("Failed to create queue for incoming websocket connection. Closing..");
return -1;
@ -268,13 +267,13 @@ int websocket_start(struct node *n)
int ret;
struct websocket *w = n->_vd;
size_t blocklen = LWS_PRE + WEBMSG_LEN(DEFAULT_SAMPLELEN);
size_t blocklen = LWS_PRE + WEBMSG_LEN(DEFAULT_WEBSOCKET_SAMPLELEN);
ret = pool_init(&w->pool, 64 * DEFAULT_QUEUELEN, blocklen, &memtype_hugepage);
ret = pool_init(&w->pool, DEFAULT_WEBSOCKET_QUEUELEN, blocklen, &memtype_hugepage);
if (ret)
return ret;
ret = queue_signalled_init(&w->queue, DEFAULT_QUEUELEN, &memtype_hugepage);
ret = queue_signalled_init(&w->queue, DEFAULT_WEBSOCKET_QUEUELEN, &memtype_hugepage);
if (ret)
return ret;