X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dbb6a5398ebdb917f1de3acc0d16cd83cd23de71..489169a6a758347a95e7ec2b9f92543331fb239d:/src/surf/network_ns3.c

diff --git a/src/surf/network_ns3.c b/src/surf/network_ns3.c
index e5684d7bed..9248945253 100644
--- 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");
 
-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;
@@ -26,8 +26,9 @@ 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 surf_action_t ns3_communicate(void *src_elm, void *dst_elm,
-    double size, double rate);
+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);
 static int action_is_suspended(surf_action_t action);
@@ -252,7 +253,7 @@ static void create_ns3_topology(void)
   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);
@@ -260,8 +261,8 @@ static void create_ns3_topology(void)
   onelink_t onelink;
   unsigned int iter;
   xbt_dynar_foreach(onelink_routes, iter, onelink) {
-    char *src = ((network_element_t)onelink->src)->name;
-    char *dst = ((network_element_t)onelink->dst)->name;
+    char *src = onelink->src->name;
+    char *dst = onelink->dst->name;
     void *link = onelink->link_ptr;
     if( strcmp(src,dst) && ((surf_ns3_link_t)link)->created){
       XBT_DEBUG("Route from '%s' to '%s' with link '%s'",src,dst,((surf_ns3_link_t)link)->data->id);
@@ -365,7 +366,7 @@ void surf_network_model_init_NS3()
     xbt_die("Impossible to initialize NS3 interface");
   }
 
-  routing_model_create(sizeof(s_surf_ns3_link_t), NULL);
+  routing_model_create(NULL);
   define_callbacks_ns3();
 
   NS3_HOST_LEVEL = xbt_lib_add_level(host_lib,(void_f_pvoid_t)free_ns3_host);
@@ -478,15 +479,16 @@ static void ns3_update_actions_state(double now, double delta)
 }
 
 /* Max durations are not supported */
-static surf_action_t ns3_communicate(void *src_elm,
-    void *dst_elm, double size, double rate)
+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;
 
-  XBT_DEBUG("Communicate from %s to %s",((network_element_t)src_elm)->name,((network_element_t)dst_elm)->name);
+  XBT_DEBUG("Communicate from %s to %s", src_elm->name, dst_elm->name);
   action = surf_action_new(sizeof(s_surf_action_network_ns3_t), size, surf_network_model, 0);
 
-  ns3_create_flow(((network_element_t)src_elm)->name, ((network_element_t)dst_elm)->name, surf_get_clock(), size, action);
+  ns3_create_flow(src_elm->name, dst_elm->name, surf_get_clock(), size, action);
 
 #ifdef HAVE_TRACING
   action->last_sent = 0;