From 70dfa6fc085ea9b93a4f64e429d29cb1f2e14c15 Mon Sep 17 00:00:00 2001 From: schnorr Date: Tue, 6 Mar 2012 11:11:01 +0100 Subject: [PATCH] [trace] no longer need to pass the parent, we find the lowest common parent instead --- src/instr/instr_routing.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c index 553ecead18..a6707efd8d 100644 --- a/src/instr/instr_routing.c +++ b/src/instr/instr_routing.c @@ -50,7 +50,7 @@ static container_t lowestCommonAncestor (container_t a1, container_t a2) return NULL; } -static void linkContainers (container_t father, container_t src, container_t dst, xbt_dict_t filter) +static void linkContainers (container_t src, container_t dst, xbt_dict_t filter) { //ignore loopback if (strcmp (src->name, "__loopback__") == 0 || strcmp (dst->name, "__loopback__") == 0) @@ -139,10 +139,10 @@ static void recursiveGraphExtraction (AS_t rc, container_t container, xbt_dict_t link_CM02_t *link = ((link_CM02_t*)xbt_dynar_get_ptr (route, i)); char *link_name = (*link)->lmm_resource.generic_resource.name; container_t current = PJ_container_get(link_name); - linkContainers(container, previous, current, filter); + linkContainers(previous, current, filter); previous = current; } - linkContainers(container, previous, child2, filter); + linkContainers(previous, child2, filter); }else if (child1->kind == INSTR_AS && child2->kind == INSTR_AS && @@ -157,11 +157,11 @@ static void recursiveGraphExtraction (AS_t rc, container_t container, xbt_dict_t xbt_dynar_foreach (route->link_list, cpt, link) { char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name; container_t current = PJ_container_get(link_name); - linkContainers (container, previous, current, filter); + linkContainers (previous, current, filter); previous = current; } container_t last = PJ_container_get(route->dst_gateway); - linkContainers (container, previous, last, filter); + linkContainers (previous, last, filter); generic_free_route(route); } } -- 2.20.1