X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/903d96f4c7e2f761608b4591faa573aab5891994..52fe97957ab5de4890ece1fe5b20dabf907523c6:/src/surf/xml/surfxml_sax_cb.cpp

diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp
index 6d1612db7c..a5b3edf0e1 100644
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -20,10 +20,9 @@
 
 #include "src/surf/xml/platf_private.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
-                                "Logging specific to the SURF parsing module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module");
 #undef CLEANUP
-int ETag_surfxml_include_state(void);
+int ETag_surfxml_include_state();
 
 #include "simgrid_dtd.c"
 
@@ -242,15 +241,15 @@ FILE *surf_file_to_parse = nullptr;
 /*
  * Stuff relative to storage
  */
-void STag_surfxml_storage(void)
+void STag_surfxml_storage()
 {
   AS_TAG = 0;
   XBT_DEBUG("STag_surfxml_storage");
   xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
 }
-void ETag_surfxml_storage(void)
+void ETag_surfxml_storage()
 {
-  s_sg_platf_storage_cbarg_t storage = SG_PLATF_STORAGE_INITIALIZER;
+  s_sg_platf_storage_cbarg_t storage;
   memset(&storage,0,sizeof(storage));
 
   storage.id           = A_surfxml_storage_id;
@@ -262,16 +261,16 @@ void ETag_surfxml_storage(void)
   sg_platf_new_storage(&storage);
   current_property_set = nullptr;
 }
-void STag_surfxml_storage___type(void)
+void STag_surfxml_storage___type()
 {
   AS_TAG = 0;
   XBT_DEBUG("STag_surfxml_storage___type");
   xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
   xbt_assert(current_model_property_set == nullptr, "Someone forgot to reset the model property set to nullptr in its closing tag (or XML malformed)");
 }
-void ETag_surfxml_storage___type(void)
+void ETag_surfxml_storage___type()
 {
-  s_sg_platf_storage_type_cbarg_t storage_type = SG_PLATF_STORAGE_TYPE_INITIALIZER;
+  s_sg_platf_storage_type_cbarg_t storage_type;
   memset(&storage_type,0,sizeof(storage_type));
 
   storage_type.content          = A_surfxml_storage___type_content;
@@ -286,26 +285,13 @@ void ETag_surfxml_storage___type(void)
   current_property_set       = nullptr;
   current_model_property_set = nullptr;
 }
-void STag_surfxml_mstorage(void)
-{
-  XBT_DEBUG("STag_surfxml_mstorage");
-}
-void ETag_surfxml_mstorage(void)
-{
-  s_sg_platf_mstorage_cbarg_t mstorage = SG_PLATF_MSTORAGE_INITIALIZER;
-  memset(&mstorage,0,sizeof(mstorage));
-
-  mstorage.name    = A_surfxml_mstorage_name;
-  mstorage.type_id = A_surfxml_mstorage_typeId;
-  sg_platf_new_mstorage(&mstorage);
-}
-void STag_surfxml_mount(void)
+void STag_surfxml_mount()
 {
   XBT_DEBUG("STag_surfxml_mount");
 }
-void ETag_surfxml_mount(void)
+void ETag_surfxml_mount()
 {
-  s_sg_platf_mount_cbarg_t mount = SG_PLATF_MOUNT_INITIALIZER;
+  s_sg_platf_mount_cbarg_t mount;
   memset(&mount,0,sizeof(mount));
 
   mount.name      = A_surfxml_mount_name;
@@ -320,7 +306,7 @@ static xbt_dynar_t surf_input_buffer_stack    = nullptr;
 static xbt_dynar_t surf_file_to_parse_stack   = nullptr;
 static xbt_dynar_t surf_parsed_filename_stack = nullptr;
 
-void STag_surfxml_include(void)
+void STag_surfxml_include()
 {
   parse_after_config();
   XBT_DEBUG("STag_surfxml_include '%s'",A_surfxml_include_file);
@@ -339,7 +325,7 @@ void STag_surfxml_include(void)
   fflush(nullptr);
 }
 
-void ETag_surfxml_include(void) {
+void ETag_surfxml_include() {
 /* Nothing to do when done with reading the include tag.
  * Instead, the handling should be deferred until the EOF of current buffer -- see below */
 }
@@ -355,7 +341,7 @@ void ETag_surfxml_include(void) {
  * directly: a command line flag could instruct it to do the correct thing when #include is encountered
  * on a line. One day maybe, if the maya allow it.
  */
-int ETag_surfxml_include_state(void)
+int ETag_surfxml_include_state()
 {
   fflush(nullptr);
   XBT_DEBUG("ETag_surfxml_include_state '%s'",A_surfxml_include_file);
@@ -378,7 +364,7 @@ int ETag_surfxml_include_state(void)
 
 /* Stag and Etag parse functions */
 
-void STag_surfxml_platform(void) {
+void STag_surfxml_platform() {
   XBT_ATTRIB_UNUSED double version = surf_parse_get_double(A_surfxml_platform_version);
 
   xbt_assert((version >= 1.0), "******* BIG FAT WARNING *********\n "
@@ -413,18 +399,18 @@ void STag_surfxml_platform(void) {
 
   sg_platf_begin();
 }
-void ETag_surfxml_platform(void){
+void ETag_surfxml_platform(){
   sg_platf_end();
 }
 
-void STag_surfxml_host(void){
+void STag_surfxml_host(){
   AS_TAG = 0;
   xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
 }
 
-void STag_surfxml_prop(void)
+void STag_surfxml_prop()
 {
-  if(AS_TAG){
+  if(AS_TAG){ // We need a stack here to retrieve the most recently opened AS
     if (!as_current_property_set){
       xbt_assert(as_prop_nb < 1024, "Number of AS property reach the limit!!!");
       as_current_property_set = xbt_dict_new_homogeneous(xbt_free_f); // Maybe, it should raise an error
@@ -444,10 +430,10 @@ void STag_surfxml_prop(void)
   }
 }
 
-void ETag_surfxml_host(void)    {
-  s_sg_platf_host_cbarg_t host = SG_PLATF_HOST_INITIALIZER;
-  char* buf;
+void ETag_surfxml_host()    {
+  s_sg_platf_host_cbarg_t host;
   memset(&host,0,sizeof(host));
+  char* buf;
 
 
   host.properties = current_property_set;
@@ -456,22 +442,19 @@ void ETag_surfxml_host(void)    {
 
   buf = A_surfxml_host_speed;
   XBT_DEBUG("Buffer: %s", buf);
-  host.speed_peak = xbt_dynar_new(sizeof(double), nullptr);
+  host.speed_per_pstate = xbt_dynar_new(sizeof(double), nullptr);
   if (strchr(buf, ',') == nullptr){
     double speed = surf_parse_get_speed(A_surfxml_host_speed,"speed of host", host.id);
-    xbt_dynar_push_as(host.speed_peak,double, speed);
+    xbt_dynar_push_as(host.speed_per_pstate,double, speed);
   }
   else {
     xbt_dynar_t pstate_list = xbt_str_split(buf, ",");
     unsigned int i;
-    for (i = 0; i < xbt_dynar_length(pstate_list); i++) {
-      double speed;
-      char* speed_str;
-
-      xbt_dynar_get_cpy(pstate_list, i, &speed_str);
+    char* speed_str;
+    xbt_dynar_foreach(pstate_list, i, speed_str) {
       xbt_str_trim(speed_str, nullptr);
-      speed = surf_parse_get_speed(speed_str,"speed of host", host.id);
-      xbt_dynar_push_as(host.speed_peak, double, speed);
+      double speed = surf_parse_get_speed(speed_str,"speed of host", host.id);
+      xbt_dynar_push_as(host.speed_per_pstate, double, speed);
       XBT_DEBUG("Speed value: %f", speed);
     }
     xbt_dynar_free(&pstate_list);
@@ -479,19 +462,19 @@ void ETag_surfxml_host(void)    {
 
   XBT_DEBUG("pstate: %s", A_surfxml_host_pstate);
   host.core_amount = surf_parse_get_int(A_surfxml_host_core);
-  host.speed_trace = tmgr_trace_new_from_file(A_surfxml_host_availability___file);
-  host.state_trace = tmgr_trace_new_from_file(A_surfxml_host_state___file);
+  host.speed_trace = A_surfxml_host_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_host_availability___file) : nullptr;
+  host.state_trace = A_surfxml_host_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_host_state___file) : nullptr;
   host.pstate      = surf_parse_get_int(A_surfxml_host_pstate);
   host.coord       = A_surfxml_host_coordinates;
 
   sg_platf_new_host(&host);
-  xbt_dynar_free(&host.speed_peak);
+  xbt_dynar_free(&host.speed_per_pstate);
   current_property_set = nullptr;
 }
 
-void STag_surfxml_host___link(void){
+void STag_surfxml_host___link(){
   XBT_DEBUG("Create a Host_link for %s",A_surfxml_host___link_id);
-  s_sg_platf_host_link_cbarg_t host_link = SG_PLATF_HOST_LINK_INITIALIZER;
+  s_sg_platf_host_link_cbarg_t host_link;
   memset(&host_link,0,sizeof(host_link));
 
   host_link.id        = A_surfxml_host___link_id;
@@ -500,8 +483,8 @@ void STag_surfxml_host___link(void){
   sg_platf_new_hostlink(&host_link);
 }
 
-void STag_surfxml_router(void){
-  s_sg_platf_router_cbarg_t router = SG_PLATF_ROUTER_INITIALIZER;
+void STag_surfxml_router(){
+  s_sg_platf_router_cbarg_t router;
   memset(&router, 0, sizeof(router));
 
   router.id    = A_surfxml_router_id;
@@ -510,8 +493,8 @@ void STag_surfxml_router(void){
   sg_platf_new_router(&router);
 }
 
-void ETag_surfxml_cluster(void){
-  s_sg_platf_cluster_cbarg_t cluster = SG_PLATF_CLUSTER_INITIALIZER;
+void ETag_surfxml_cluster(){
+  s_sg_platf_cluster_cbarg_t cluster;
   memset(&cluster,0,sizeof(cluster));
   cluster.properties = as_current_property_set;
 
@@ -528,7 +511,7 @@ void ETag_surfxml_cluster(void){
   if(strcmp(A_surfxml_cluster_bb___lat,""))
     cluster.bb_lat = surf_parse_get_time(A_surfxml_cluster_bb___lat, "bb_lat of cluster", cluster.id);
   if(strcmp(A_surfxml_cluster_limiter___link,""))
-    cluster.limiter_link = surf_parse_get_double(A_surfxml_cluster_limiter___link);
+    cluster.limiter_link = surf_parse_get_bandwidth(A_surfxml_cluster_limiter___link, "limiter_link of cluster", cluster.id);
   if(strcmp(A_surfxml_cluster_loopback___bw,""))
     cluster.loopback_bw = surf_parse_get_bandwidth(A_surfxml_cluster_loopback___bw, "loopback_bw of cluster", cluster.id);
   if(strcmp(A_surfxml_cluster_loopback___lat,""))
@@ -544,6 +527,9 @@ void ETag_surfxml_cluster(void){
   case A_surfxml_cluster_topology_FAT___TREE:
     cluster.topology = SURF_CLUSTER_FAT_TREE;
     break;
+  case A_surfxml_cluster_topology_DRAGONFLY:
+    cluster.topology= SURF_CLUSTER_DRAGONFLY ;
+    break;
   default:
     surf_parse_error("Invalid cluster topology for cluster %s",
                      cluster.id);
@@ -580,21 +566,19 @@ void ETag_surfxml_cluster(void){
     break;
   }
 
-  cluster.availability_trace = A_surfxml_cluster_availability___file;
-  cluster.state_trace = A_surfxml_cluster_state___file;
   sg_platf_new_cluster(&cluster);
 
   current_property_set = nullptr;
 }
 
-void STag_surfxml_cluster(void){
+void STag_surfxml_cluster(){
   parse_after_config();
   xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
 }
 
-void STag_surfxml_cabinet(void){
+void STag_surfxml_cabinet(){
   parse_after_config();
-  s_sg_platf_cabinet_cbarg_t cabinet = SG_PLATF_CABINET_INITIALIZER;
+  s_sg_platf_cabinet_cbarg_t cabinet;
   memset(&cabinet,0,sizeof(cabinet));
   cabinet.id      = A_surfxml_cabinet_id;
   cabinet.prefix  = A_surfxml_cabinet_prefix;
@@ -607,9 +591,9 @@ void STag_surfxml_cabinet(void){
   sg_platf_new_cabinet(&cabinet);
 }
 
-void STag_surfxml_peer(void){
+void STag_surfxml_peer(){
   parse_after_config();
-  s_sg_platf_peer_cbarg_t peer = SG_PLATF_PEER_INITIALIZER;
+  s_sg_platf_peer_cbarg_t peer;
   memset(&peer,0,sizeof(peer));
   peer.id                 = A_surfxml_peer_id;
   peer.speed              = surf_parse_get_speed(A_surfxml_peer_speed, "speed of peer", peer.id);
@@ -617,28 +601,28 @@ void STag_surfxml_peer(void){
   peer.bw_out             = surf_parse_get_bandwidth(A_surfxml_peer_bw___out, "bw_out of peer", peer.id);
   peer.lat                = surf_parse_get_time(A_surfxml_peer_lat, "lat of peer", peer.id);
   peer.coord              = A_surfxml_peer_coordinates;
-  peer.availability_trace = tmgr_trace_new_from_file(A_surfxml_peer_availability___file);
-  peer.state_trace        = tmgr_trace_new_from_file(A_surfxml_peer_state___file);
+  peer.availability_trace = A_surfxml_peer_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_availability___file) : nullptr;
+  peer.state_trace        = A_surfxml_peer_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_state___file) : nullptr;
 
   sg_platf_new_peer(&peer);
 }
 
-void STag_surfxml_link(void){
+void STag_surfxml_link(){
   AS_TAG = 0;
   xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
 }
 
-void ETag_surfxml_link(void){
-  s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
+void ETag_surfxml_link(){
+  s_sg_platf_link_cbarg_t link;
   memset(&link,0,sizeof(link));
 
   link.properties          = current_property_set;
   link.id                  = A_surfxml_link_id;
   link.bandwidth           = surf_parse_get_bandwidth(A_surfxml_link_bandwidth, "bandwidth of link", link.id);
-  link.bandwidth_trace     = tmgr_trace_new_from_file(A_surfxml_link_bandwidth___file);
+  link.bandwidth_trace     = A_surfxml_link_bandwidth___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_bandwidth___file) : nullptr;
   link.latency             = surf_parse_get_time(A_surfxml_link_latency, "latency of link", link.id);
-  link.latency_trace       = tmgr_trace_new_from_file(A_surfxml_link_latency___file);
-  link.state_trace         = tmgr_trace_new_from_file(A_surfxml_link_state___file);
+  link.latency_trace       = A_surfxml_link_latency___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_latency___file) : nullptr;
+  link.state_trace         = A_surfxml_link_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_state___file):nullptr;
 
   switch (A_surfxml_link_sharing___policy) {
   case A_surfxml_link_sharing___policy_SHARED:
@@ -660,7 +644,7 @@ void ETag_surfxml_link(void){
   current_property_set = nullptr;
 }
 
-void STag_surfxml_link___ctn(void){
+void STag_surfxml_link___ctn(){
 
   char *link_id;
   switch (A_surfxml_link___ctn_direction) {
@@ -681,12 +665,11 @@ void STag_surfxml_link___ctn(void){
   xbt_dynar_push(parsed_link_list, &link_id);
 }
 
-void ETag_surfxml_backbone(void){
-  s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
+void ETag_surfxml_backbone(){
+  s_sg_platf_link_cbarg_t link;
   memset(&link,0,sizeof(link));
 
   link.properties = nullptr;
-
   link.id = A_surfxml_backbone_id;
   link.bandwidth = surf_parse_get_bandwidth(A_surfxml_backbone_bandwidth, "bandwidth of backbone", link.id);
   link.latency = surf_parse_get_time(A_surfxml_backbone_latency, "latency of backbone", link.id);
@@ -696,7 +679,7 @@ void ETag_surfxml_backbone(void){
   routing_cluster_add_backbone(sg_link_by_name(A_surfxml_backbone_id));
 }
 
-void STag_surfxml_route(void){
+void STag_surfxml_route(){
   surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_route_src),
       "Route src='%s' does name a node.", A_surfxml_route_src);
   surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_route_dst),
@@ -704,7 +687,7 @@ void STag_surfxml_route(void){
   parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
 }
 
-void STag_surfxml_ASroute(void){
+void STag_surfxml_ASroute(){
   surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_ASroute_src),
       "ASroute src='%s' does name a node.", A_surfxml_route_src);
   surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_ASroute_dst),
@@ -718,7 +701,7 @@ void STag_surfxml_ASroute(void){
   parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
 }
 
-void STag_surfxml_bypassRoute(void){
+void STag_surfxml_bypassRoute(){
   surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassRoute_src),
       "bypassRoute src='%s' does name a node.", A_surfxml_bypassRoute_src);
   surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassRoute_dst),
@@ -727,7 +710,7 @@ void STag_surfxml_bypassRoute(void){
   parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
 }
 
-void STag_surfxml_bypassASroute(void){
+void STag_surfxml_bypassASroute(){
   surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassASroute_src),
       "bypassASroute src='%s' does name a node.", A_surfxml_bypassASroute_src);
   surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassASroute_dst),
@@ -740,12 +723,13 @@ void STag_surfxml_bypassASroute(void){
   parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
 }
 
-void ETag_surfxml_route(void){
+void ETag_surfxml_route(){
   s_sg_platf_route_cbarg_t route;
   memset(&route,0,sizeof(route));
 
-  route.src       = A_surfxml_route_src;
-  route.dst       = A_surfxml_route_dst;
+
+  route.src       = sg_netcard_by_name_or_null(A_surfxml_route_src); // tested to not be nullptr in start tag
+  route.dst       = sg_netcard_by_name_or_null(A_surfxml_route_dst); // tested to not be nullptr in start tag
   route.gw_src    = nullptr;
   route.gw_dst    = nullptr;
   route.link_list = new std::vector<Link*>();
@@ -758,28 +742,20 @@ void ETag_surfxml_route(void){
     route.link_list->push_back(link);
   }
 
-
-
   sg_platf_new_route(&route);
-  parsed_link_list = nullptr;
+  delete route.link_list;
+  xbt_dynar_free(&parsed_link_list);
 }
 
-void ETag_surfxml_ASroute(void){
+void ETag_surfxml_ASroute(){
   s_sg_platf_route_cbarg_t ASroute;
   memset(&ASroute,0,sizeof(ASroute));
 
-  ASroute.src = A_surfxml_ASroute_src;
-  ASroute.dst = A_surfxml_ASroute_dst;
-
-  ASroute.gw_src = sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___src);
-  ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___dst);
+  ASroute.src    = sg_netcard_by_name_or_null(A_surfxml_ASroute_src); // tested to not be nullptr in start tag
+  ASroute.dst    = sg_netcard_by_name_or_null(A_surfxml_ASroute_dst); // tested to not be nullptr in start tag
 
-  if (A_surfxml_ASroute_gw___src && !ASroute.gw_src)
-    surf_parse_error("gw_src=\"%s\" not found for ASroute from \"%s\" to \"%s\"",
-                     A_surfxml_ASroute_gw___src, ASroute.src, ASroute.dst);
-  if (A_surfxml_ASroute_gw___dst && !ASroute.gw_dst)
-    surf_parse_error("gw_dst=\"%s\" not found for ASroute from \"%s\" to \"%s\"",
-                     A_surfxml_ASroute_gw___dst, ASroute.src, ASroute.dst);
+  ASroute.gw_src = sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___src); // tested to not be nullptr in start tag
+  ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___dst); // tested to not be nullptr in start tag
 
   ASroute.link_list =  new std::vector<Link*>();
 
@@ -789,6 +765,7 @@ void ETag_surfxml_ASroute(void){
     simgrid::surf::Link *link = Link::byName(link_name);
     ASroute.link_list->push_back(link);
   }
+  xbt_dynar_free(&parsed_link_list);
 
   switch (A_surfxml_ASroute_symmetrical) {
   case AU_surfxml_ASroute_symmetrical:
@@ -801,15 +778,15 @@ void ETag_surfxml_ASroute(void){
   }
 
   sg_platf_new_route(&ASroute);
-  parsed_link_list = nullptr;
+  delete ASroute.link_list;
 }
 
-void ETag_surfxml_bypassRoute(void){
+void ETag_surfxml_bypassRoute(){
   s_sg_platf_route_cbarg_t route;
   memset(&route,0,sizeof(route));
 
-  route.src = A_surfxml_bypassRoute_src;
-  route.dst = A_surfxml_bypassRoute_dst;
+  route.src = sg_netcard_by_name_or_null(A_surfxml_bypassRoute_src); // tested to not be nullptr in start tag
+  route.dst = sg_netcard_by_name_or_null(A_surfxml_bypassRoute_dst); // tested to not be nullptr in start tag
   route.gw_src = nullptr;
   route.gw_dst = nullptr;
   route.symmetrical = false;
@@ -826,13 +803,13 @@ void ETag_surfxml_bypassRoute(void){
   sg_platf_new_bypassRoute(&route);
 }
 
-void ETag_surfxml_bypassASroute(void){
+void ETag_surfxml_bypassASroute(){
   s_sg_platf_route_cbarg_t ASroute;
   memset(&ASroute,0,sizeof(ASroute));
 
-  ASroute.src         = A_surfxml_bypassASroute_src;
-  ASroute.dst         = A_surfxml_bypassASroute_dst;
-  ASroute.link_list   =  new std::vector<Link*>();
+  ASroute.src         = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_src);
+  ASroute.dst         = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_dst);
+  ASroute.link_list   = new std::vector<Link*>();
   unsigned int cpt;
   char *link_name;
   xbt_dynar_foreach(parsed_link_list, cpt, link_name) {
@@ -848,8 +825,8 @@ void ETag_surfxml_bypassASroute(void){
   sg_platf_new_bypassRoute(&ASroute);
 }
 
-void ETag_surfxml_trace(void){
-  s_sg_platf_trace_cbarg_t trace = SG_PLATF_TRACE_INITIALIZER;
+void ETag_surfxml_trace(){
+  s_sg_platf_trace_cbarg_t trace;
   memset(&trace,0,sizeof(trace));
 
   trace.id = A_surfxml_trace_id;
@@ -860,9 +837,9 @@ void ETag_surfxml_trace(void){
   sg_platf_new_trace(&trace);
 }
 
-void STag_surfxml_trace___connect(void){
+void STag_surfxml_trace___connect(){
   parse_after_config();
-  s_sg_platf_trace_connect_cbarg_t trace_connect = SG_PLATF_TRACE_CONNECT_INITIALIZER;
+  s_sg_platf_trace_connect_cbarg_t trace_connect;
   memset(&trace_connect,0,sizeof(trace_connect));
 
   trace_connect.element = A_surfxml_trace___connect_element;
@@ -889,33 +866,28 @@ void STag_surfxml_trace___connect(void){
   sg_platf_trace_connect(&trace_connect);
 }
 
-void STag_surfxml_AS(void){
+void STag_surfxml_AS(){
   parse_after_config();
   AS_TAG                   = 1;
-  s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER;
-  AS.id                    = A_surfxml_AS_id;
-  AS.routing               = (int)A_surfxml_AS_routing;
+  s_sg_platf_AS_cbarg_t AS = { A_surfxml_AS_id, (int)A_surfxml_AS_routing};
 
   as_current_property_set = nullptr;
 
   sg_platf_new_AS_begin(&AS);
 }
-void ETag_surfxml_AS(void){
+void ETag_surfxml_AS(){
   if(as_prop_nb){
     char *name      = as_name_tab[as_prop_nb-1];
     xbt_dict_t dict = (xbt_dict_t) as_dict_tab[as_prop_nb-1];
     as_prop_nb--;
     XBT_DEBUG("POP prop %p for AS '%s'",dict,name);
-    xbt_lib_set(as_router_lib,
-        name,
-      ROUTING_PROP_ASR_LEVEL,
-      dict);
+    xbt_lib_set(as_router_lib, name, ROUTING_PROP_ASR_LEVEL, dict);
     xbt_free(name);
   }
-  sg_platf_new_AS_end();
+  sg_platf_new_AS_seal();
 }
 
-void STag_surfxml_config(void){
+void STag_surfxml_config(){
   AS_TAG = 0;
   xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
   XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);
@@ -923,15 +895,15 @@ void STag_surfxml_config(void){
     surf_parse_error("All <config> tags must be given before any platform elements (such as <AS>, <host>, <cluster>, <link>, etc).");
   }
 }
-void ETag_surfxml_config(void){
+void ETag_surfxml_config(){
   xbt_dict_cursor_t cursor = nullptr;
   char *key;
   char *elem;
   char *cfg;
   xbt_dict_foreach(current_property_set, cursor, key, elem) {
     cfg = bprintf("%s:%s",key,elem);
-    if(xbt_cfg_is_default_value(_sg_cfg_set, key))
-      xbt_cfg_set_parse(_sg_cfg_set, cfg);
+    if(xbt_cfg_is_default_value(key))
+      xbt_cfg_set_parse(cfg);
     else
       XBT_INFO("The custom configuration '%s' is already defined by user!",key);
     free(cfg);
@@ -945,7 +917,7 @@ void ETag_surfxml_config(void){
 static int argc;
 static char **argv;
 
-void STag_surfxml_process(void){
+void STag_surfxml_process(){
   AS_TAG  = 0;
   argc    = 1;
   argv    = xbt_new(char *, 1);
@@ -953,8 +925,8 @@ void STag_surfxml_process(void){
   xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
 }
 
-void ETag_surfxml_process(void){
-  s_sg_platf_process_cbarg_t process = SG_PLATF_PROCESS_INITIALIZER;
+void ETag_surfxml_process(){
+  s_sg_platf_process_cbarg_t process;
   memset(&process,0,sizeof(process));
 
   process.argc       = argc;
@@ -976,45 +948,48 @@ void ETag_surfxml_process(void){
   }
 
   sg_platf_new_process(&process);
+
+  for (int i = 0; i != argc; ++i)
+    xbt_free(argv[i]);
+  xbt_free(argv);
+  argv = nullptr;
+
   current_property_set = nullptr;
 }
 
-void STag_surfxml_argument(void){
+void STag_surfxml_argument(){
   argc++;
   argv = (char**)xbt_realloc(argv, (argc) * sizeof(char **));
   argv[(argc) - 1] = xbt_strdup(A_surfxml_argument_value);
 }
 
-void STag_surfxml_model___prop(void){
+void STag_surfxml_model___prop(){
   if (!current_model_property_set)
     current_model_property_set = xbt_dict_new_homogeneous(xbt_free_f);
 
   xbt_dict_set(current_model_property_set, A_surfxml_model___prop_id, xbt_strdup(A_surfxml_model___prop_value), nullptr);
 }
 
-void STag_surfxml_gpu(void) {}
-void ETag_surfxml_gpu(void) {}
-
 /* nothing to do in those functions */
-void ETag_surfxml_prop(void){}
-void STag_surfxml_random(void){}
-void ETag_surfxml_random(void){}
-void ETag_surfxml_trace___connect(void){}
-void STag_surfxml_trace(void){parse_after_config();}
-void ETag_surfxml_router(void){}
-void ETag_surfxml_host___link(void){}
-void ETag_surfxml_cabinet(void){}
-void ETag_surfxml_peer(void){}
-void STag_surfxml_backbone(void){}
-void ETag_surfxml_link___ctn(void){}
-void ETag_surfxml_argument(void){}
-void ETag_surfxml_model___prop(void){}
+void ETag_surfxml_prop(){}
+void STag_surfxml_random(){}
+void ETag_surfxml_random(){}
+void ETag_surfxml_trace___connect(){}
+void STag_surfxml_trace(){parse_after_config();}
+void ETag_surfxml_router(){}
+void ETag_surfxml_host___link(){}
+void ETag_surfxml_cabinet(){}
+void ETag_surfxml_peer(){}
+void STag_surfxml_backbone(){}
+void ETag_surfxml_link___ctn(){}
+void ETag_surfxml_argument(){}
+void ETag_surfxml_model___prop(){}
 
 /* Open and Close parse file */
 
 void surf_parse_open(const char *file)
 {
-  xbt_assert(file, "Cannot parse the NULL file. Bypassing the parser is strongly deprecated nowadays.");
+  xbt_assert(file, "Cannot parse the nullptr file. Bypassing the parser is strongly deprecated nowadays.");
 
   if (!surf_input_buffer_stack)
     surf_input_buffer_stack = xbt_dynar_new(sizeof(YY_BUFFER_STATE), nullptr);
@@ -1035,7 +1010,7 @@ void surf_parse_open(const char *file)
   surf_parse_lineno = 1;
 }
 
-void surf_parse_close(void)
+void surf_parse_close()
 {
   xbt_dynar_free(&surf_input_buffer_stack);
   xbt_dynar_free(&surf_file_to_parse_stack);
@@ -1058,7 +1033,7 @@ void surf_parse_close(void)
 
 /* Call the lexer to parse the currently opened file. This pointer to function enables bypassing of the parser */
 
-static int _surf_parse(void) {
+static int _surf_parse() {
   return surf_parse_lex();
 }
 int_f_void_t surf_parse = _surf_parse;