From a74f61000353d2236c3a583158199fd23a10300d Mon Sep 17 00:00:00 2001
From: martinezric <ricardo.martinez@cttc.es>
Date: Fri, 5 May 2023 11:09:56 +0200
Subject: [PATCH] PathComp component - Backend:
- Minor code cleanup
---
src/pathcomp/backend/pathComp_sp.c | 6 +++---
src/pathcomp/backend/pathComp_tools.h | 7 ++++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/pathcomp/backend/pathComp_sp.c b/src/pathcomp/backend/pathComp_sp.c
index 6c48a8d1b..9cbd29eff 100644
--- a/src/pathcomp/backend/pathComp_sp.c
+++ b/src/pathcomp/backend/pathComp_sp.c
@@ -231,9 +231,9 @@ void sp_execution_services(struct compRouteOutputList_t* oPathList) {
continue;
}
struct path_t* path = &(pathService->paths[pathService->numPaths - 1]);
- allocate_graph_resources(path, service, g);
- allocate_graph_reverse_resources(path, service, g);
- print_graph(g);
+ //allocate_graph_resources(path, service, g); // LGR: crashes in some cases with assymetric topos
+ //allocate_graph_reverse_resources(path, service, g); // LGR: crashes in some cases with assymetric topos
+ print_graph(g);
}
return;
}
diff --git a/src/pathcomp/backend/pathComp_tools.h b/src/pathcomp/backend/pathComp_tools.h
index 9819c9080..fb458d8c0 100644
--- a/src/pathcomp/backend/pathComp_tools.h
+++ b/src/pathcomp/backend/pathComp_tools.h
@@ -125,8 +125,9 @@ struct map_nodes_t {
gint numMapNodes;
};
-#define MAX_NUM_VERTICES 20 // 100 # LGR: reduced from 100 to 20 to divide by 5 the memory used
-#define MAX_NUM_EDGES 10 // 100 # LGR: reduced from 100 to 10 to divide by 10 the memory used
+#define MAX_NUM_VERTICES 100 // 100 # LGR: reduced from 100 to 20 to divide by 5 the memory used
+#define MAX_NUM_EDGES 5 // 100 # LGR: reduced from 100 to 5 to divide by 20 the memory used
+
// Structures for the graph composition
struct targetNodes_t {
// remote / targeted node
@@ -250,7 +251,7 @@ struct endPoint_t {
// Structure for the device contents
///////////////////////////////////////////////////////////////////
#define MAX_DEV_TYPE_SIZE 128
-#define MAX_DEV_ENDPOINT_LENGTH 10
+#define MAX_DEV_ENDPOINT_LENGTH 100 // 10 # LGR: controllers might have large number of endpoints
struct device_t {
gdouble power_idle; // power idle (baseline) of the switch in Watts
gint operational_status; // 0 - Undefined, 1 - Disabled, 2 - Enabled
--
GitLab