A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge get_route and get_latency in routings too
[simgrid.git]
/
src
/
instr
/
instr_routing.c
diff --git
a/src/instr/instr_routing.c
b/src/instr/instr_routing.c
index
df7e05b
..
784bf3d
100644
(file)
--- a/
src/instr/instr_routing.c
+++ b/
src/instr/instr_routing.c
@@
-83,11
+83,11
@@
static void linkContainers (container_t father, container_t src, container_t dst
new_pajeEndLink(SIMIX_get_clock(), father, link_type, dst, "G", key);
}
new_pajeEndLink(SIMIX_get_clock(), father, link_type, dst, "G", key);
}
-static void recursiveGraphExtraction (
routing_component
_t rc, container_t container, xbt_dict_t filter)
+static void recursiveGraphExtraction (
AS
_t rc, container_t container, xbt_dict_t filter)
{
{
- if (
xbt_dict_length
(rc->routing_sons)){
+ if (
!xbt_dict_is_empty
(rc->routing_sons)){
xbt_dict_cursor_t cursor = NULL;
xbt_dict_cursor_t cursor = NULL;
-
routing_component
_t rc_son;
+
AS
_t rc_son;
char *child_name;
//bottom-up recursion
xbt_dict_foreach(rc->routing_sons, cursor, child_name, rc_son) {
char *child_name;
//bottom-up recursion
xbt_dict_foreach(rc->routing_sons, cursor, child_name, rc_son) {
@@
-110,7
+110,13
@@
static void recursiveGraphExtraction (routing_component_t rc, container_t contai
strcmp (child1_name, child2_name) != 0){
xbt_dynar_t route = NULL;
strcmp (child1_name, child2_name) != 0){
xbt_dynar_t route = NULL;
- route = global_routing->get_route_or_null (child1_name, child2_name);
+ xbt_ex_t e;
+
+ TRY {
+ routing_get_route_and_latency(child1_name, child2_name, &route, NULL);
+ } CATCH(e) {
+ xbt_ex_free(e);
+ }
if (route == NULL) continue;
if (TRACE_onelink_only()){
if (route == NULL) continue;
if (TRACE_onelink_only()){
@@
-131,11
+137,13
@@
static void recursiveGraphExtraction (routing_component_t rc, container_t contai
child2->kind == INSTR_AS &&
strcmp(child1_name, child2_name) != 0){
child2->kind == INSTR_AS &&
strcmp(child1_name, child2_name) != 0){
- route_extended_t route = rc->get_route (rc, child1_name, child2_name);
+ route_t route = xbt_new0(s_route_t,1);
+ route->link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
+ rc->get_route_and_latency (rc, child1_name, child2_name, route,NULL);
unsigned int cpt;
void *link;
container_t previous = getContainerByName(route->src_gateway);
unsigned int cpt;
void *link;
container_t previous = getContainerByName(route->src_gateway);
- xbt_dynar_foreach (route->
generic_route.
link_list, cpt, link) {
+ xbt_dynar_foreach (route->link_list, cpt, link) {
char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
container_t current = getContainerByName(link_name);
linkContainers (container, previous, current, filter);
char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
container_t current = getContainerByName(link_name);
linkContainers (container, previous, current, filter);
@@
-143,6
+151,7
@@
static void recursiveGraphExtraction (routing_component_t rc, container_t contai
}
container_t last = getContainerByName(route->dst_gateway);
linkContainers (container, previous, last, filter);
}
container_t last = getContainerByName(route->dst_gateway);
linkContainers (container, previous, last, filter);
+ generic_free_route(route);
}
}
}
}
}
}
@@
-386,11
+395,11
@@
static xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_node_
}
static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges,
}
static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges,
-
routing_component
_t rc, container_t container)
+
AS
_t rc, container_t container)
{
{
- if (
xbt_dict_length
(rc->routing_sons)){
+ if (
!xbt_dict_is_empty
(rc->routing_sons)){
xbt_dict_cursor_t cursor = NULL;
xbt_dict_cursor_t cursor = NULL;
-
routing_component
_t rc_son;
+
AS
_t rc_son;
char *child_name;
//bottom-up recursion
xbt_dict_foreach(rc->routing_sons, cursor, child_name, rc_son) {
char *child_name;
//bottom-up recursion
xbt_dict_foreach(rc->routing_sons, cursor, child_name, rc_son) {
@@
-412,7
+421,9
@@
static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xb
(child2->kind == INSTR_HOST || child2->kind == INSTR_ROUTER) &&
strcmp (child1_name, child2_name) != 0){
(child2->kind == INSTR_HOST || child2->kind == INSTR_ROUTER) &&
strcmp (child1_name, child2_name) != 0){
- xbt_dynar_t route = global_routing->get_route (child1_name, child2_name);
+ // FIXME factorize route creation with else branch below (once possible)
+ xbt_dynar_t route=NULL;
+ routing_get_route_and_latency (child1_name, child2_name,&route,NULL);
if (TRACE_onelink_only()){
if (xbt_dynar_length (route) > 1) continue;
}
if (TRACE_onelink_only()){
if (xbt_dynar_length (route) > 1) continue;
}
@@
-433,11
+444,13
@@
static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xb
child2->kind == INSTR_AS &&
strcmp(child1_name, child2_name) != 0){
child2->kind == INSTR_AS &&
strcmp(child1_name, child2_name) != 0){
- route_extended_t route = rc->get_route (rc, child1_name, child2_name);
+ route_t route = xbt_new0(s_route_t,1);
+ route->link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
+ rc->get_route_and_latency (rc, child1_name, child2_name,route, NULL);
unsigned int cpt;
void *link;
xbt_node_t current, previous = new_xbt_graph_node(graph, route->src_gateway, nodes);
unsigned int cpt;
void *link;
xbt_node_t current, previous = new_xbt_graph_node(graph, route->src_gateway, nodes);
- xbt_dynar_foreach (route->
generic_route.
link_list, cpt, link) {
+ xbt_dynar_foreach (route->link_list, cpt, link) {
char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
current = new_xbt_graph_node(graph, link_name, nodes);
//previous -> current
char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
current = new_xbt_graph_node(graph, link_name, nodes);
//previous -> current
@@
-445,6
+458,7
@@
static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xb
}
current = new_xbt_graph_node(graph, route->dst_gateway, nodes);
new_xbt_graph_edge (graph, previous, current, edges);
}
current = new_xbt_graph_node(graph, route->dst_gateway, nodes);
new_xbt_graph_edge (graph, previous, current, edges);
+ generic_free_route(route);
}
}
}
}
}
}