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

replaced static array for NGSI mapping by dynamic one

Browse source
This commit is contained in:
Steffen Vogel 2015-10-12 13:49:31 +02:00
parent 4271c17d68
commit 0d59e63be6
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
server/include/ngsi.h
View file

@ -47,15 +47,12 @@ struct ngsi {
} structure; /**< Structure of published entitites */
/** A mapping between indices of the S2SS messages and the attributes in ngsi::context */
json_t **context_map;
/** The number of mappings in ngsi::context_map */
int context_len;
struct curl_slist *headers; /**< List of HTTP request headers for libcurl */
CURL *curl; /**< libcurl: handle */
json_t *context; /**< The complete JSON tree which will be used for contextUpdate requests */
struct list mapping; /**< A mapping between indices of the S2SS messages and the attributes in ngsi::context */
};
/** Initialize global NGSI settings and maps shared memory regions.

24
server/src/ngsi.c
View file

@ -131,12 +131,12 @@ void ngsi_prepare_context(struct node *n, config_setting_t *mapping)
struct ngsi *i = n->ngsi;
i->context = json_object();
i->context_len = config_setting_length(mapping);
i->context_map = alloc(i->context_len * sizeof(json_t *));
list_init(&i->mapping, NULL);
json_t *elements = json_array();
for (int j = 0; j < i->context_len; j++) {
for (int j = 0; j < config_setting_length(mapping); j++) {
/* Get token */
config_setting_t *ctoken = config_setting_get_elem(mapping, j);
const char *stoken = config_setting_get_string(ctoken);
@ -213,11 +213,13 @@ void ngsi_prepare_context(struct node *n, config_setting_t *mapping)
));
}
json_t *attribute = i->context_map[j] = json_pack("{ s: s, s: s, s: s }",
json_t *attribute = json_pack("{ s: s, s: s, s: [ ] }",
"name", aname,
"type", atype,
"value", "0"
"value"
);
list_push(&i->mapping, attribute);
json_object_set_new(attribute, "metadatas", metadatas);
json_array_append_new(attributes, attribute);
@ -341,8 +343,9 @@ int ngsi_write(struct node *n, struct msg *pool, int poolsize, int first, int cn
error("NGSI nodes only can send a single message at once");
/* Update context */
for (int j = 0; j < MIN(i->context_len, m->length); j++) {
json_t *attribute = i->context_map[j];
for (int j = 0; j < MIN(i->mapping.length, m->length); j++) {
json_t *attribute = list_at(&i->mapping, j);
json_t *values = json_object_get(attribute, "value");
json_t *metadatas = json_object_get(attribute, "metadatas");
/* Update timestamp */
@ -350,11 +353,8 @@ int ngsi_write(struct node *n, struct msg *pool, int poolsize, int first, int cn
json_object_set(metadata_ts, "value", json_date(&MSG_TS(m)));
/* Update value */
char new[64];
snprintf(new, sizeof(new), "%f", m->data[j].f); /** @todo for now we only support floating point values */
json_t *value = json_object_get(attribute, "value");
json_string_set(value, new);
json_array_clear(values);
json_array_append_new(values, json_real(m->data[j].f));
}
/* Update UUIDs for children structure */