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

Added flag which lets path use original sequence number of source

Browse source
This commit is contained in:
Dennis Potter 2018-10-14 14:44:56 +02:00
parent 1d918229e8
commit 8f90d77224
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/villas/path.h
View file

@ -99,6 +99,7 @@ struct path {
int reverse; /**< This path as a matching reverse path. */
int builtin; /**< This path should use built-in hooks by default. */
int queuelen; /**< The queue length for each path_destination::queue */
int original_sequence_no; /**< Use original source sequence number when multiplexing */
char *_name; /**< Singleton: A string which is used to print this path to screen. */

14
lib/path.c
View file

@ -116,7 +116,7 @@ static void path_source_read(struct path_source *ps, struct path *p, int i)
? sample_clone(p->last_sample)
: sample_clone(muxed_smps[i-1]);
muxed_smps[i]->sequence = p->last_sequence++;
muxed_smps[i]->sequence = p->original_sequence_no ? tomux_smps[i]->sequence : p->last_sequence++;
muxed_smps[i]->ts = tomux_smps[i]->ts;
mapping_remap(&ps->mappings, muxed_smps[i], tomux_smps[i], NULL);
@ -334,6 +334,7 @@ int path_init(struct path *p)
p->enabled = 1;
p->poll = -1;
p->queuelen = DEFAULT_QUEUE_LENGTH;
p->original_sequence_no = 0;
p->state = STATE_INITIALIZED;
@ -492,7 +493,7 @@ int path_parse(struct path *p, json_t *cfg, struct list *nodes)
list_init(&sources);
list_init(&destinations);
ret = json_unpack_ex(cfg, &err, 0, "{ s: o, s?: o, s?: o, s?: b, s?: b, s?: b, s?: i, s?: s, s?: b, s?: F, s?: o }",
ret = json_unpack_ex(cfg, &err, 0, "{ s: o, s?: o, s?: o, s?: b, s?: b, s?: b, s?: i, s?: s, s?: b, s?: F, s?: o, s?: b}",
"in", &json_in,
"out", &json_out,
"hooks", &json_hooks,
@ -503,7 +504,9 @@ int path_parse(struct path *p, json_t *cfg, struct list *nodes)
"mode", &mode,
"poll", &p->poll,
"rate", &p->rate,
"mask", &json_mask
"mask", &json_mask,
"original_sequence_no", &p->original_sequence_no
);
if (ret)
jerror(&err, "Failed to parse path configuration");
@ -695,7 +698,7 @@ int path_start(struct path *p)
mask = bitset_dump(&p->mask);
info("Starting path %s: #signals=%zu, mode=%s, poll=%s, mask=%s, rate=%.2f, enabled=%s, reversed=%s, queuelen=%d, #hooks=%zu, #sources=%zu, #destinations=%zu",
info("Starting path %s: #signals=%zu, mode=%s, poll=%s, mask=%s, rate=%.2f, enabled=%s, reversed=%s, queuelen=%d, #hooks=%zu, #sources=%zu, #destinations=%zu, #original_sequence_no=%s",
path_name(p),
list_length(&p->signals),
mode,
@ -707,7 +710,8 @@ int path_start(struct path *p)
p->queuelen,
list_length(&p->hooks),
list_length(&p->sources),
list_length(&p->destinations)
list_length(&p->destinations),
p->original_sequence_no ? "yes" : "no"
);
free(mask);