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

pipe: do not show warning messages for samples filtered by hooks

Browse source
This commit is contained in:
Steffen Vogel 2019-01-28 12:30:14 +01:00
parent be5358254f
commit 8e24d603e5
2 changed files with 14 additions and 8 deletions

18
lib/node.c
View file

@ -587,7 +587,7 @@ int node_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *rel
int node_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release)
{
int sent, nsent = 0;
int tosend, sent, nsent = 0;
assert(n->state == STATE_STARTED || n->state == STATE_CONNECTED);
assert(node_type(n)->write);
@ -602,9 +602,14 @@ int node_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *re
/* Send in parts if vector not supported */
if (node_type(n)->vectorize > 0 && node_type(n)->vectorize < cnt) {
while (cnt - nsent > 0) {
sent = node_type(n)->write(n, &smps[nsent], MIN(cnt - nsent, node_type(n)->vectorize), release);
if (sent < 0)
tosend = MIN(cnt - nsent, node_type(n)->vectorize);
sent = node_type(n)->write(n, &smps[nsent], tosend, release);
if (sent < 0) {
warning("Failed to send samples to node %s: reason=%d", node_name(n), sent);
return sent;
}
else if (sent < tosend)
warning("Failed to send %d out of %d samples to node %s", tosend-sent, tosend, node_name(n));
nsent += sent;
debug(LOG_NODE | 5, "Sent %u samples to node %s", sent, node_name(n));
@ -612,8 +617,13 @@ int node_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *re
}
else {
nsent = node_type(n)->write(n, smps, cnt, release);
if (nsent < 0)
if (nsent < 0) {
warning("Failed to send samples to node %s: reason=%d", node_name(n), nsent);
return nsent;
}
else if (nsent < cnt)
warning("Failed to send %d out of %d samples to node %s", cnt-nsent, cnt, node_name(n));
debug(LOG_NODE | 5, "Sent %u samples to node %s", nsent, node_name(n));
}

4
src/villas-pipe.cpp
View file

@ -169,10 +169,6 @@ static void * send_loop(void *ctx)
release = allocated;
sent = node_write(dirs->send.node, smps, scanned, &release);
if (sent < 0)
logger->warn("Failed to send samples to node {}: reason={}", node_name(dirs->send.node), sent);
else if (sent < scanned)
logger->warn("Failed to send {} out of {} samples to node {}", scanned-sent, scanned, node_name(dirs->send.node));
sample_decref_many(smps, release);