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

nodes: remove hard-coded sample lengths from pool initializations

Browse source
This commit is contained in:
Steffen Vogel 2021-06-24 06:33:23 -04:00 • committed by Steffen Vogel
parent e0c622af86
commit c49ee5b21c
4 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/villas/nodes/ethercat.hpp
View file

@ -51,7 +51,6 @@ extern "C" {
}
#define DEFAULT_ETHERCAT_QUEUE_LENGTH (DEFAULT_QUEUE_LENGTH * 64)
#define DEFAULT_ETHERCAT_SAMPLE_LENGTH DEFAULT_SAMPLE_LENGTH
/** Internal data per ethercat node */
struct ethercat {

1
include/villas/nodes/websocket.hpp
View file

@ -40,7 +40,6 @@
struct vnode;
#define DEFAULT_WEBSOCKET_QUEUE_LENGTH (DEFAULT_QUEUE_LENGTH * 64)
#define DEFAULT_WEBSOCKET_SAMPLE_LENGTH DEFAULT_SAMPLE_LENGTH
/* Forward declaration */
struct lws;

2
lib/nodes/ethercat.cpp
View file

@ -389,7 +389,7 @@ int ethercat_init(struct vnode *n)
new (&w->thread) std::thread();
new (&w->task) Task(CLOCK_REALTIME);
ret = pool_init(&w->pool, DEFAULT_ETHERCAT_QUEUE_LENGTH, SAMPLE_LENGTH(DEFAULT_ETHERCAT_SAMPLE_LENGTH));
ret = pool_init(&w->pool, DEFAULT_ETHERCAT_QUEUE_LENGTH, SAMPLE_LENGTH(vlist_length(&n->in.signals)));
if (ret)
return ret;

2
lib/nodes/websocket.cpp
View file

@ -372,7 +372,7 @@ int websocket_start(struct vnode *n)
int ret;
struct websocket *w = (struct websocket *) n->_vd;
ret = pool_init(&w->pool, DEFAULT_WEBSOCKET_QUEUE_LENGTH, SAMPLE_LENGTH(DEFAULT_WEBSOCKET_SAMPLE_LENGTH));
ret = pool_init(&w->pool, DEFAULT_WEBSOCKET_QUEUE_LENGTH, SAMPLE_LENGTH(vlist_length(&n->in.signals)));
if (ret)
return ret;