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

check if struct sample::signals is set everywhere properly

Browse source
This commit is contained in:
Steffen Vogel 2020-07-06 15:07:05 +02:00
parent 21a16166f9
commit 0e0250dcba
12 changed files with 49 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/formats/csv.cpp
View file

@ -110,7 +110,6 @@ static size_t csv_sscan_single(struct io *io, const char *buf, size_t len, struc
smp->flags |= (int) SampleFlags::HAS_SEQUENCE;
for (ptr = end + 1, i = 0; i < smp->capacity; ptr = end + 1, i++) {
if (*end == io->delimiter)
goto out;
@ -177,7 +176,9 @@ void csv_header(struct io *io, const struct sample *smp)
if (io->flags & (int) SampleFlags::HAS_DATA) {
for (unsigned i = 0; i < smp->length; i++) {
struct signal *sig = (struct signal *) vlist_at(smp->signals, i);
struct signal *sig = (struct signal *) vlist_at_safe(smp->signals, i);
if (!sig)
break;
if (sig->name)
fprintf(f, "%s", sig->name);

2
lib/formats/json.cpp
View file

@ -124,6 +124,8 @@ static int json_pack_sample(struct io *io, json_t **j, struct sample *smp)
for (unsigned i = 0; i < smp->length; i++) {
struct signal *sig = (struct signal *) vlist_at_safe(smp->signals, i);
if (!sig)
return -1;
json_t *json_value = signal_data_to_json(&smp->data[i], sig);

4
lib/formats/json_reserve.cpp
View file

@ -49,9 +49,7 @@ static int json_reserve_pack_sample(struct io *io, json_t **j, struct sample *sm
json_data = json_array();
for (unsigned i = 0; i < smp->length; i++) {
struct signal *sig;
sig = (struct signal *) vlist_at_safe(smp->signals, i);
struct signal *sig = (struct signal *) vlist_at_safe(smp->signals, i);
if (!sig)
return -1;

24
lib/formats/msg.cpp
View file

@ -76,18 +76,17 @@ int msg_verify(struct msg *m)
int msg_to_sample(struct msg *msg, struct sample *smp, struct vlist *signals)
{
int ret;
unsigned i;
ret = msg_verify(msg);
if (ret)
return -1;
return ret;
smp->flags = (int) SampleFlags::HAS_TS_ORIGIN | (int) SampleFlags::HAS_SEQUENCE | (int) SampleFlags::HAS_DATA;
smp->length = MIN(msg->length, smp->capacity);
smp->sequence = msg->sequence;
MSG_TS(msg, smp->ts.origin);
for (unsigned i = 0; i < MIN(smp->length, vlist_length(signals)); i++) {
struct signal *sig = (struct signal *) vlist_at(signals, i);
unsigned len = MIN(msg->length, smp->capacity);
for (i = 0; i < MIN(len, vlist_length(signals)); i++) {
struct signal *sig = (struct signal *) vlist_at_safe(signals, i);
if (!sig)
return -1;
switch (sig->type) {
case SignalType::FLOAT:
@ -103,6 +102,11 @@ int msg_to_sample(struct msg *msg, struct sample *smp, struct vlist *signals)
}
}
smp->flags = (int) SampleFlags::HAS_TS_ORIGIN | (int) SampleFlags::HAS_SEQUENCE | (int) SampleFlags::HAS_DATA;
smp->length = i;
smp->sequence = msg->sequence;
MSG_TS(msg, smp->ts.origin);
return 0;
}
@ -118,7 +122,9 @@ int msg_from_sample(struct msg *msg_in, struct sample *smp, struct vlist *signal
msg_in->ts.nsec = smp->ts.origin.tv_nsec;
for (unsigned i = 0; i < smp->length; i++) {
struct signal *sig = (struct signal *) vlist_at(signals, i);
struct signal *sig = (struct signal *) vlist_at_safe(signals, i);
if (!sig)
return -1;
switch (sig->type) {
case SignalType::FLOAT:

4
lib/formats/value.cpp
View file

@ -43,7 +43,7 @@ int value_sprint(struct io *io, char *buf, size_t len, size_t *wbytes, struct sa
for (i = 0; i < smp->length; i++) {
sig = (struct signal *) vlist_at_safe(smp->signals, i);
if (!sig)
break;
return -1;
off += signal_data_print_str(&smp->data[i], sig, buf, len);
off += snprintf(buf + off, len - off, "\n");
@ -70,7 +70,7 @@ int value_sscan(struct io *io, const char *buf, size_t len, size_t *rbytes, stru
if (smp->capacity >= 1) {
struct signal *sig = (struct signal *) vlist_at_safe(io->signals, i);
if (!sig)
goto out;
return -1;
ret = signal_data_parse_str(&smp->data[i], sig, ptr, &end);
if (ret || end == ptr) /* There are no valid values anymore. */

5
lib/formats/villas_human.cpp
View file

@ -133,7 +133,6 @@ static size_t villas_human_sscan_single(struct io *io, const char *buf, size_t l
unsigned i;
for (ptr = end + 1, i = 0; i < smp->capacity; ptr = end + 1, i++) {
if (*end == io->delimiter)
goto out;
@ -208,7 +207,9 @@ void villas_human_header(struct io *io, const struct sample *smp)
if (io->flags & (int) SampleFlags::HAS_DATA) {
for (unsigned i = 0; i < MIN(smp->length, vlist_length(smp->signals)); i++) {
struct signal *sig = (struct signal *) vlist_at(smp->signals, i);
struct signal *sig = (struct signal *) vlist_at_safe(smp->signals, i);
if (!sig)
break;
if (sig->name)
fprintf(f, "%c%s", io->separator, sig->name);

1
lib/nodes/comedi.cpp
View file

@ -579,6 +579,7 @@ int comedi_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *r
for (size_t i = 0; i < cnt; i++) {
d->counter++;
smps[i]->signals = &n->in.signals;
smps[i]->flags = (int) SampleFlags::HAS_TS_ORIGIN | (int) SampleFlags::HAS_DATA | (int) SampleFlags::HAS_SEQUENCE;
smps[i]->sequence = d->counter / d->chanlist_len;

5
lib/nodes/example.cpp
View file

@ -179,6 +179,11 @@ int example_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *
smps[0]->data[0].f = time_delta(&now, &s->start_time);
/* Dont forget to set other flags in struct sample::flags
* E.g. for sequence no, timestamps... */
smps[0]->flags = (int) SampleFlags::HAS_DATA;
smps[0]->signals = &n->in.signals;
read = 1; /* The number of samples read */
return read;

2
lib/nodes/fpga.cpp
View file

@ -287,6 +287,8 @@ int fpga_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *rel
for (unsigned i = 0; i < MIN(read, smp->capacity); i++)
smp->data[i].i = f->in.mem[i];
smp->signals = &n->in.signals;
return read;
}

1
lib/nodes/infiniband.cpp
View file

@ -865,6 +865,7 @@ int ib_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *relea
smps[j]->length = SAMPLE_NUMBER_OF_VALUES(wc[j].byte_len - correction);
smps[j]->ts.received = ts_receive;
smps[j]->flags = (int) SampleFlags::HAS_TS_ORIGIN | (int) SampleFlags::HAS_TS_RECEIVED | (int) SampleFlags::HAS_SEQUENCE;
smps[j]->signals = &n->in.signals;
}
}

20
lib/nodes/ngsi.cpp
View file

@ -66,8 +66,10 @@ struct ngsi_response {
size_t len;
};
static json_t* ngsi_build_entity(struct ngsi *i, struct sample *smps[], unsigned cnt, int flags)
static json_t* ngsi_build_entity(struct node *n, struct sample *smps[], unsigned cnt, int flags)
{
struct ngsi *i = (struct ngsi *) n->_vd;
json_t *entity = json_pack("{ s: s, s: s, s: b }",
"id", i->entity_id,
"type", i->entity_type,
@ -123,11 +125,13 @@ static json_t* ngsi_build_entity(struct ngsi *i, struct sample *smps[], unsigned
return entity;
}
static int ngsi_parse_entity(json_t *entity, struct ngsi *i, struct sample *smps[], unsigned cnt)
static int ngsi_parse_entity(struct node *n, json_t *entity, struct sample *smps[], unsigned cnt)
{
int ret;
const char *id, *name, *type;
struct ngsi *i = (struct ngsi *) n->_vd;
size_t l;
json_error_t err;
json_t *attribute, *attributes;
@ -196,6 +200,8 @@ static int ngsi_parse_entity(json_t *entity, struct ngsi *i, struct sample *smps
smps[k]->data[map->index].f = strtof(value, &end);
if (value == end)
return -10;
smps[k]->signals = &n->in.signals;
}
}
@ -503,7 +509,7 @@ int ngsi_start(struct node *n)
curl_easy_setopt(i->curl, CURLOPT_USERAGENT, USER_AGENT);
/* Create entity and atributes */
json_t *entity = ngsi_build_entity(i, nullptr, 0, NGSI_ENTITY_METADATA);
json_t *entity = ngsi_build_entity(n, nullptr, 0, NGSI_ENTITY_METADATA);
ret = ngsi_request_context_update(i->curl, i->endpoint, "APPEND", entity);
if (ret)
@ -522,7 +528,7 @@ int ngsi_stop(struct node *n)
i->task.stop();
/* Delete complete entity (not just attributes) */
json_t *entity = ngsi_build_entity(i, nullptr, 0, 0);
json_t *entity = ngsi_build_entity(n, nullptr, 0, 0);
ret = ngsi_request_context_update(i->curl, i->endpoint, "DELETE", entity);
@ -543,13 +549,13 @@ int ngsi_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *rel
perror("Failed to wait for task");
json_t *rentity;
json_t *entity = ngsi_build_entity(i, nullptr, 0, 0);
json_t *entity = ngsi_build_entity(n, nullptr, 0, 0);
ret = ngsi_request_context_query(i->curl, i->endpoint, entity, &rentity);
if (ret)
goto out;
ret = ngsi_parse_entity(rentity, i, smps, cnt);
ret = ngsi_parse_entity(n, entity, smps, cnt);
if (ret)
goto out2;
@ -564,7 +570,7 @@ int ngsi_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *re
struct ngsi *i = (struct ngsi *) n->_vd;
int ret;
json_t *entity = ngsi_build_entity(i, smps, cnt, NGSI_ENTITY_VALUES);
json_t *entity = ngsi_build_entity(n, smps, cnt, NGSI_ENTITY_VALUES);
ret = ngsi_request_context_update(i->curl, i->endpoint, "UPDATE", entity);

1
lib/nodes/test_rtt.cpp
View file

@ -399,6 +399,7 @@ int test_rtt_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned
smps[i]->sequence = t->counter;
smps[i]->ts.origin = now;
smps[i]->flags = (int) SampleFlags::HAS_DATA | (int) SampleFlags::HAS_SEQUENCE | (int) SampleFlags::HAS_TS_ORIGIN;
smps[i]->signals = &n->in.signals;
t->counter++;
}