[routing] rename routing_global_t -> routing_platf_t (and friends)

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

diff --git a/src/surf/network_ns3.c b/src/surf/network_ns3.c
index b235051..5083d94 100644 (file)
--- a/src/surf/network_ns3.c
+++ b/src/surf/network_ns3.c
@@ -18,7 +18,7 @@ extern xbt_lib_t as_router_lib;
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_ns3, surf,
                                 "Logging specific to the SURF network NS3 module");
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_ns3, surf,
                                 "Logging specific to the SURF network NS3 module");
 

-extern routing_global_t global_routing;
+extern routing_platf_t routing_platf;

 extern xbt_dict_t dict_socket;
 
 static double time_to_next_flow_completion = -1;
 extern xbt_dict_t dict_socket;
 
 static double time_to_next_flow_completion = -1;


@@ -26,8 +26,8 @@ static double time_to_next_flow_completion = -1;
 static double ns3_share_resources(double min);
 static void ns3_update_actions_state(double now, double delta);
 static void finalize(void);
 static double ns3_share_resources(double min);
 static void ns3_update_actions_state(double now, double delta);
 static void finalize(void);

-static surf_action_t ns3_communicate(network_element_t src_elm,
-                                     network_element_t dst_elm,
+static surf_action_t ns3_communicate(sg_routing_edge_t src_elm,
+                                     sg_routing_edge_t dst_elm,

                                      double size, double rate);
 static void action_suspend(surf_action_t action);
 static void action_resume(surf_action_t action);
                                      double size, double rate);
 static void action_suspend(surf_action_t action);
 static void action_resume(surf_action_t action);


@@ -253,7 +253,7 @@ static void create_ns3_topology(void)
   xbt_dynar_shrink(IPV4addr,0);
 
   //get the onelinks from the parsed platform
   xbt_dynar_shrink(IPV4addr,0);
 
   //get the onelinks from the parsed platform

-  xbt_dynar_t onelink_routes = global_routing->get_onelink_routes();
+  xbt_dynar_t onelink_routes = routing_platf->get_onelink_routes();

   if (!onelink_routes)
     xbt_die("There is no routes!");
   XBT_DEBUG("Have get_onelink_routes, found %ld routes",onelink_routes->used);
   if (!onelink_routes)
     xbt_die("There is no routes!");
   XBT_DEBUG("Have get_onelink_routes, found %ld routes",onelink_routes->used);


@@ -479,8 +479,8 @@ static void ns3_update_actions_state(double now, double delta)
 }
 
 /* Max durations are not supported */
 }
 
 /* Max durations are not supported */

-static surf_action_t ns3_communicate(network_element_t src_elm,
-                                     network_element_t dst_elm,
+static surf_action_t ns3_communicate(sg_routing_edge_t src_elm,
+                                     sg_routing_edge_t dst_elm,

                                      double size, double rate)
 {
   surf_action_network_ns3_t action = NULL;
                                      double size, double rate)
 {
   surf_action_network_ns3_t action = NULL;