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

shmem: add new mode setting which superseeds the polling setting

Browse source
This commit is contained in:
Steffen Vogel 2018-10-20 17:12:39 +02:00
parent 27a1ef0314
commit ef91faafac
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/nodes/shmem.c
View file

@ -39,7 +39,7 @@
int shmem_parse(struct node *n, json_t *cfg)
{
struct shmem *shm = (struct shmem *) n->_vd;
const char *val;
const char *val, *mode_str = NULL;
int ret;
json_t *json_exec = NULL;
@ -51,18 +51,27 @@ int shmem_parse(struct node *n, json_t *cfg)
shm->conf.polling = false;
shm->exec = NULL;
ret = json_unpack_ex(cfg, &err, 0, "{ s: { s: s }, s: { s: s }, s?: i, s?: b, s?: o }",
ret = json_unpack_ex(cfg, &err, 0, "{ s: { s: s }, s: { s: s }, s?: i, s?: o, s?: s }",
"out",
"name", &shm->out_name,
"in",
"name", &shm->in_name,
"queuelen", &shm->conf.queuelen,
"polling", &shm->conf.polling,
"exec", &json_exec
"exec", &json_exec,
"mode", &mode_str
);
if (ret)
jerror(&err, "Failed to parse configuration of node %s", node_name(n));
if (mode_str) {
if (!strcmp(mode_str, "polling"))
shm->conf.polling = true;
else if (!strcmp(mode_str, "pthread"))
shm->conf.polling = false;
else
error("Unknown mode '%s' in node %s", mode_str, node_name(n));
}
if (json_exec) {
if (!json_is_array(json_exec))
error("Setting 'exec' of node %s must be an array of strings", node_name(n));