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

path: properly handle reference counts for samples

Browse source
This commit is contained in:
Steffen Vogel 2017-07-13 22:25:05 +02:00
parent daadd3f442
commit 37148f0bb0
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/path.c
View file

@ -61,11 +61,8 @@ static void path_read(struct path *p)
recv = node_read(ps->node, smps, ready);
if (recv < 0)
error("Failed to receive message from node %s", node_name(ps->node));
else if (recv < ready) {
else if (recv < ready)
warn("Partial read for path %s: read=%u expected=%u", path_name(p), recv, ready);
/* Free samples that weren't written to */
sample_free(smps+recv, ready-recv);
}
/* Run preprocessing hooks for vector of samples */
enqueue = hook_read_list(&p->hooks, smps, recv);
@ -75,10 +72,9 @@ static void path_read(struct path *p)
if (p->stats)
stats_update(p->stats->delta, STATS_SKIPPED, recv - enqueue);
}
/* Keep track of the lowest index that wasn't enqueued;
* all following samples must be freed here */
int refd = 0;
for (size_t i = 0; i < list_length(&p->destinations); i++) {
struct path_destination *pd = list_at(&p->destinations, i);
@ -86,14 +82,13 @@ static void path_read(struct path *p)
if (enqueue != enqueued)
warn("Queue overrun for path %s", path_name(p));
if (refd < enqueued)
refd = enqueued;
/* Increase reference counter of these samples as they are now also owned by the queue. */
sample_get_many(smps, enqueued);
debug(LOG_PATH | 15, "Enqueued %u samples from %s to queue of %s", enqueued, node_name(ps->node), node_name(pd->node));
}
/* Release those samples which have not been pushed into a queue */
sample_free(smps + refd, ready - refd);
sample_put_many(smps, ready);
}
static void path_write(struct path *p)