model-checker : remove unused argument in functions for heap comparison algorithm

[simgrid.git] / src / surf / surf_routing_dijkstra.c

diff --git a/src/surf/surf_routing_dijkstra.c b/src/surf/surf_routing_dijkstra.c
index e4ea7de..2d7b1dd 100644 (file)
--- a/src/surf/surf_routing_dijkstra.c
+++ b/src/surf/surf_routing_dijkstra.c
@@ -7,7 +7,7 @@
 #include "surf_routing_private.h"
 
 /* Global vars */
-extern routing_global_t global_routing;
+extern routing_platf_t routing_platf;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic");
 
@@ -56,8 +56,6 @@ static void graph_edge_data_free(void *e) // FIXME: useless code dupplication
   route_t e_route = (route_t) e;
   if (e_route) {
     xbt_dynar_free(&(e_route->link_list));
-    xbt_free(e_route->src_gateway);
-    xbt_free(e_route->dst_gateway);
     xbt_free(e_route);
   }
 }
@@ -159,14 +157,14 @@ static void add_loopback_dijkstra(as_dijkstra_t as) {
       route_t e_route = xbt_new0(s_route_t, 1);
       e_route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
       xbt_dynar_push(e_route->link_list,
-          &global_routing->loopback);
+          &routing_platf->loopback);
       xbt_graph_new_edge(as->route_graph, node, node, e_route);
     }
   }
 }
 
 static void dijkstra_get_route_and_latency(AS_t as_generic,
-    network_element_t src, network_element_t dst, route_t route, double *lat);
+    sg_routing_edge_t src, sg_routing_edge_t dst, route_t route, double *lat);
 
 static xbt_dynar_t dijkstra_get_onelink_routes(AS_t as)
 {
@@ -175,13 +173,13 @@ static xbt_dynar_t dijkstra_get_onelink_routes(AS_t as)
   route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t),NULL);
 
   int src,dst;
-  network_element_t src_elm, dst_elm;
+  sg_routing_edge_t src_elm, dst_elm;
   size_t table_size = xbt_dynar_length(as->index_network_elm);
   for(src=0; src < table_size; src++) {
     for(dst=0; dst< table_size; dst++) {
       xbt_dynar_reset(route->link_list);
-      src_elm = xbt_dynar_get_as(as->index_network_elm,src,network_element_t);
-      dst_elm = xbt_dynar_get_as(as->index_network_elm,dst,network_element_t);
+      src_elm = xbt_dynar_get_as(as->index_network_elm,src,sg_routing_edge_t);
+      dst_elm = xbt_dynar_get_as(as->index_network_elm,dst,sg_routing_edge_t);
       dijkstra_get_route_and_latency(as, src_elm, dst_elm,route, NULL);
 
       if (xbt_dynar_length(route->link_list) == 1) {
@@ -203,7 +201,7 @@ static xbt_dynar_t dijkstra_get_onelink_routes(AS_t as)
 }
 
 static void dijkstra_get_route_and_latency(AS_t asg,
-    network_element_t src, network_element_t dst,
+    sg_routing_edge_t src, sg_routing_edge_t dst,
     route_t route, double *lat)
 {
 
@@ -332,8 +330,8 @@ static void dijkstra_get_route_and_latency(AS_t asg,
   }
 
   /* compose route path with links */
-  network_element_t gw_src = NULL, gw_dst, prev_gw_src, first_gw = NULL;
-  network_element_t gw_dst_net_elm = NULL, prev_gw_src_net_elm = NULL;
+  sg_routing_edge_t gw_src = NULL, gw_dst, prev_gw_src, first_gw = NULL;
+  sg_routing_edge_t gw_dst_net_elm = NULL, prev_gw_src_net_elm = NULL;
 
   for (v = dst_node_id; v != src_node_id; v = pred_arr[v]) {
     xbt_node_t node_pred_v =
@@ -456,7 +454,7 @@ void model_dijkstra_both_end(AS_t as)
     THIS_AS->route_cache = xbt_dict_new_homogeneous(&route_cache_elem_free);
 
   /* Add the loopback if needed */
-  if (global_routing->loopback && as->hierarchy == SURF_ROUTING_BASE)
+  if (routing_platf->loopback && as->hierarchy == SURF_ROUTING_BASE)
     add_loopback_dijkstra(THIS_AS);
 
   /* initialize graph indexes in nodes after graph has been built */
@@ -485,14 +483,10 @@ void model_dijkstra_both_parse_route (AS_t asg, const char *src,
   }
 
   as_dijkstra_t as = (as_dijkstra_t) asg;
-  network_element_t src_net_elm, dst_net_elm;
+  sg_routing_edge_t src_net_elm, dst_net_elm;
 
-  src_net_elm = xbt_lib_get_or_null(host_lib, src, ROUTING_HOST_LEVEL);
-  dst_net_elm = xbt_lib_get_or_null(host_lib, dst, ROUTING_HOST_LEVEL);
-  if (!src_net_elm)
-    src_net_elm = xbt_lib_get_or_null(as_router_lib, src, ROUTING_ASR_LEVEL);
-  if (!dst_net_elm)
-    dst_net_elm = xbt_lib_get_or_null(as_router_lib, dst, ROUTING_ASR_LEVEL);
+  src_net_elm = sg_routing_edge_by_name_or_null(src);
+  dst_net_elm = sg_routing_edge_by_name_or_null(dst);
 
   xbt_assert(src_net_elm, "Network elements %s not found", src);
   xbt_assert(dst_net_elm, "Network elements %s not found", dst);
@@ -530,7 +524,7 @@ void model_dijkstra_both_parse_route (AS_t asg, const char *src,
       THROWF(arg_error,0,"(AS)Route from '%s' to '%s' already exists",src,dst);
 
     if (route->dst_gateway && route->src_gateway) {
-      network_element_t gw_tmp;
+      sg_routing_edge_t gw_tmp;
       gw_tmp = route->src_gateway;
       route->src_gateway = route->dst_gateway;
       route->dst_gateway = gw_tmp;