From 6b2e53feda0974038b6ab88de788e5ce90ad8611 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Tue, 11 Jun 2019 18:34:23 +0200
Subject: [PATCH] path: keep a per path list of mappings

---
 include/villas/path.h |  1 +
 lib/path.cpp          | 32 ++++++++++++++++----------------
 lib/path_source.cpp   |  2 +-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/include/villas/path.h b/include/villas/path.h
index 5775c86d0..50eabcf50 100644
--- a/include/villas/path.h
+++ b/include/villas/path.h
@@ -70,6 +70,7 @@ struct path {
 
 	struct vlist sources;		/**< List of all incoming nodes (struct path_source). */
 	struct vlist destinations;	/**< List of all outgoing nodes (struct path_destination). */
+	struct vlist mappings;		/**< List of all input mappings (struct mapping_entry). */
 	struct vlist hooks;		/**< List of processing hooks (struct hook). */
 	struct vlist signals;		/**< List of signals which this path creates (struct signal). */
 
diff --git a/lib/path.cpp b/lib/path.cpp
index f2904773d..7e70833d9 100644
--- a/lib/path.cpp
+++ b/lib/path.cpp
@@ -135,6 +135,10 @@ int path_init(struct path *p)
 	if (ret)
 		return ret;
 
+	ret = vlist_init(&p->mappings);
+	if (ret)
+		return ret;
+
 #ifdef WITH_HOOKS
 	ret = hook_list_init(&p->hooks);
 	if (ret)
@@ -233,6 +237,10 @@ int path_prepare(struct path *p)
 	}
 
 	/* Initialize sources */
+	ret = mapping_list_prepare(&p->mappings);
+	if (ret)
+		return ret;
+
 	for (size_t i = 0; i < vlist_length(&p->sources); i++) {
 		struct path_source *ps = (struct path_source *) vlist_at(&p->sources, i);
 
@@ -243,10 +251,6 @@ int path_prepare(struct path *p)
 		if (ps->masked)
 			p->mask.set(i);
 
-		ret = mapping_list_prepare(&ps->mappings);
-		if (ret)
-			return ret;
-
 		for (size_t i = 0; i < vlist_length(&ps->mappings); i++) {
 			struct mapping_entry *me = (struct mapping_entry *) vlist_at(&ps->mappings, i);
 			struct vlist *sigs = node_get_signals(me->node, NODE_DIR_IN);
@@ -319,10 +323,8 @@ int path_parse(struct path *p, json_t *cfg, struct vlist *nodes)
 
 	const char *mode = nullptr;
 
-	struct vlist sources = { .state = STATE_DESTROYED };
 	struct vlist destinations = { .state = STATE_DESTROYED };
 
-	vlist_init(&sources);
 	vlist_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, s?: b}",
@@ -343,7 +345,7 @@ int path_parse(struct path *p, json_t *cfg, struct vlist *nodes)
 		jerror(&err, "Failed to parse path configuration");
 
 	/* Input node(s) */
-	ret = mapping_list_parse(&sources, json_in, nodes);
+	ret = mapping_list_parse(&p->mappings, json_in, nodes);
 	if (ret) {
 		p->logger->error("Failed to parse input mapping of path {}", path_name(p));
 		return -1;
@@ -368,8 +370,8 @@ int path_parse(struct path *p, json_t *cfg, struct vlist *nodes)
 			jerror(&err, "Failed to parse output nodes");
 	}
 
-	for (size_t i = 0; i < vlist_length(&sources); i++) {
-		struct mapping_entry *me = (struct mapping_entry *) vlist_at(&sources, i);
+	for (size_t i = 0; i < vlist_length(&p->mappings); i++) {
+		struct mapping_entry *me = (struct mapping_entry *) vlist_at(&p->mappings, i);
 		struct path_source *ps = nullptr;
 
 		/* Check if there is already a path_source for this source */
@@ -474,9 +476,7 @@ int path_parse(struct path *p, json_t *cfg, struct vlist *nodes)
 
 #ifdef WITH_HOOKS
 	if (json_hooks) {
-		ret = hook_list_parse(&p->hooks, json_hooks, HOOK_PATH, p, nullptr);
-		if (ret)
-			return ret;
+		hook_list_parse(&p->hooks, json_hooks, HOOK_PATH, p, nullptr);
 	}
 #endif /* WITH_HOOKS */
 
@@ -490,10 +490,6 @@ int path_parse(struct path *p, json_t *cfg, struct vlist *nodes)
 			p->poll = 0;
 	}
 
-	ret = vlist_destroy(&sources, nullptr, false);
-	if (ret)
-		return ret;
-
 	ret = vlist_destroy(&destinations, nullptr, false);
 	if (ret)
 		return ret;
@@ -705,6 +701,10 @@ int path_destroy(struct path *p)
 	if (ret)
 		return ret;
 
+	ret = vlist_destroy(&p->mappings, nullptr, true);
+	if (ret)
+		return ret;
+
 	if (p->reader.pfds)
 		free(p->reader.pfds);
 
diff --git a/lib/path_source.cpp b/lib/path_source.cpp
index b82378840..4a289ff14 100644
--- a/lib/path_source.cpp
+++ b/lib/path_source.cpp
@@ -52,7 +52,7 @@ int path_source_destroy(struct path_source *ps)
 	if (ret)
 		return ret;
 
-	ret = vlist_destroy(&ps->mappings, nullptr, true);
+	ret = vlist_destroy(&ps->mappings, nullptr, false);
 	if (ret)
 		return ret;