Put the different model in the dtd. Permit the xml validation before parsing.

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

diff --git a/src/surf/network_ns3.c b/src/surf/network_ns3.c
index 7301c5c..bb5a356 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");
 
-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;
@@ -109,7 +109,7 @@ static void parse_ns3_add_router(sg_platf_router_cbarg_t router)
     );
 }
 
-static void parse_ns3_add_AS(const char*id, const char*routing)
+static void parse_ns3_add_AS(const char*id, int routing)
 {
   XBT_DEBUG("NS3_ADD_AS '%s'",id);
   xbt_lib_set(as_router_lib,
@@ -215,7 +215,7 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
   replace_bdw_ns3(&bw);
   ns3_add_cluster(bw,lat,cluster->id);
   xbt_free(lat);
-  xbt_free(bw);        
+  xbt_free(bw);  
 }
 
 static double ns3_get_link_latency (const void *link)
@@ -253,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);
@@ -272,7 +272,7 @@ static void create_ns3_topology(void)
       replace_bdw_ns3(&link_bdw);
       ((surf_ns3_link_t)link)->created = 0;
 
-      //        XBT_DEBUG("src (%s), dst (%s), src_id = %d, dst_id = %d",src,dst, src_id, dst_id);
+      //   XBT_DEBUG("src (%s), dst (%s), src_id = %d, dst_id = %d",src,dst, src_id, dst_id);
       XBT_DEBUG("\tLink (%s) bdw:%s lat:%s",((surf_ns3_link_t)link)->data->id,
                 link_bdw,
                 link_lat
@@ -317,8 +317,8 @@ static void free_ns3_link(void * elmts)
 
 static void free_ns3_host(void * elmts)
 {
-       ns3_nodes_t host = elmts;
-       free(host);
+  ns3_nodes_t host = elmts;
+  free(host);
 }
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING