X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d435bdefd34324ed0b0c25d1b6eb6dd3b7344524..8fb370cb7b0fe8f6edcec683a27ffe6e58cb3056:/src/surf/surfxml_parse.c

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 30b70dfcc5..79b283538a 100644
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -4,11 +4,13 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <stdarg.h> /* va_arg */
+
 #include "xbt/misc.h"
 #include "xbt/log.h"
 #include "xbt/str.h"
 #include "xbt/dict.h"
-#include "surf/surfxml_parse_private.h"
+#include "surf/surfxml_parse.h"
 #include "surf/surf_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
@@ -18,18 +20,34 @@ int ETag_surfxml_include_state(void);
 
 #include "simgrid_dtd.c"
 
+char* surf_parsed_filename = NULL; // to locate parse error messages
+
+xbt_dynar_t parsed_link_list = NULL;   /* temporary store of current list link of a route */
+
 /*
  * Helping functions
  */
-void surf_parse_error(const char *msg) {
-  xbt_die("Parse error on line %d: %s\n", surf_parse_lineno, msg);
+void surf_parse_error(const char *fmt, ...) {
+  va_list va;
+  va_start(va,fmt);
+  char *msg = bvprintf(fmt,va);
+  va_end(va);
+  xbt_die("Parse error at %s:%d: %s", surf_parsed_filename, surf_parse_lineno, msg);
+}
+void surf_parse_warn(const char *fmt, ...) {
+  va_list va;
+  va_start(va,fmt);
+  char *msg = bvprintf(fmt,va);
+  va_end(va);
+    XBT_WARN("%s:%d: %s", surf_parsed_filename, surf_parse_lineno, msg);
+    free(msg);
 }
 
 double surf_parse_get_double(const char *string) {
   double res;
   int ret = sscanf(string, "%lg", &res);
   if (ret != 1)
-    surf_parse_error(bprintf("%s is not a double", string));
+    surf_parse_error("%s is not a double", string);
   return res;
 }
 
@@ -37,41 +55,17 @@ int surf_parse_get_int(const char *string) {
   int res;
   int ret = sscanf(string, "%d", &res);
   if (ret != 1)
-    surf_parse_error(bprintf("%s is not an integer", string));
+    surf_parse_error("%s is not an integer", string);
   return res;
 }
 
 
 /*
- * All the callback lists that can be overiden anywhere.
+ * All the callback lists that can be overridden anywhere.
  * (this list should probably be reduced to the bare minimum to allow the models to work)
  */
 
 /* make sure these symbols are defined as strong ones in this file so that the linker can resolve them */
-xbt_dynar_t STag_surfxml_route_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_route_cb_list = NULL;
-xbt_dynar_t STag_surfxml_link_ctn_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_link_ctn_cb_list = NULL;
-xbt_dynar_t STag_surfxml_process_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_process_cb_list = NULL;
-xbt_dynar_t STag_surfxml_argument_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_argument_cb_list = NULL;
-xbt_dynar_t STag_surfxml_prop_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_prop_cb_list = NULL;
-xbt_dynar_t STag_surfxml_peer_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_peer_cb_list = NULL;
-xbt_dynar_t STag_surfxml_trace_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_trace_cb_list = NULL;
-xbt_dynar_t STag_surfxml_trace_connect_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_trace_connect_cb_list = NULL;
-xbt_dynar_t STag_surfxml_random_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_random_cb_list = NULL;
-xbt_dynar_t STag_surfxml_ASroute_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_ASroute_cb_list = NULL;
-xbt_dynar_t STag_surfxml_bypassRoute_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_bypassRoute_cb_list = NULL;
-xbt_dynar_t STag_surfxml_include_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_include_cb_list = NULL;
 
 /* The default current property receiver. Setup in the corresponding opening callbacks. */
 xbt_dict_t current_property_set = NULL;
@@ -88,23 +82,89 @@ static void init_randomness(void);
 static void add_randomness(void);
 
 /*
- * Stuff relative to the <include> tag
+ * Stuff relative to storage
  */
+void STag_surfxml_storage(void)
+{
+  XBT_DEBUG("STag_surfxml_storage");
+}
+void ETag_surfxml_storage(void)
+{
+  s_sg_platf_storage_cbarg_t storage;
+  memset(&storage,0,sizeof(storage));
+
+  storage.id = A_surfxml_storage_id;
+  storage.type_id = A_surfxml_storage_typeId;
+  storage.content = A_surfxml_storage_content;
+  sg_platf_new_storage(&storage);
+}
+void STag_surfxml_storage_type(void)
+{
+  XBT_DEBUG("STag_surfxml_storage_type");
+  xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
+}
+void ETag_surfxml_storage_type(void)
+{
+  s_sg_platf_storage_type_cbarg_t storage_type;
+  memset(&storage_type,0,sizeof(storage_type));
+
+  storage_type.content = A_surfxml_storage_type_content;
+  storage_type.id = A_surfxml_storage_type_id;
+  storage_type.model = A_surfxml_storage_type_model;
+  storage_type.properties = current_property_set;
+  storage_type.size = surf_parse_get_int(A_surfxml_storage_type_size);
+  sg_platf_new_storage_type(&storage_type);
+  current_property_set = NULL;
+}
+void STag_surfxml_mstorage(void)
+{
+  XBT_DEBUG("STag_surfxml_mstorage");
+}
+void ETag_surfxml_mstorage(void)
+{
+  s_sg_platf_mstorage_cbarg_t mstorage;
+  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)
+{
+  XBT_DEBUG("STag_surfxml_mount");
+}
+void ETag_surfxml_mount(void)
+{
+  s_sg_platf_mount_cbarg_t mount;
+  memset(&mount,0,sizeof(mount));
+
+  mount.name = A_surfxml_mount_name;
+  mount.id = A_surfxml_mount_id;
+  sg_platf_new_mount(&mount);
+}
+
+/*
+ * Stuff relative to the <include> tag
+ */
 static xbt_dynar_t surf_input_buffer_stack = NULL;
 static xbt_dynar_t surf_file_to_parse_stack = NULL;
+static xbt_dynar_t surf_parsed_filename_stack = NULL;
 
 void STag_surfxml_include(void)
 {
-  XBT_INFO("STag_surfxml_include '%s'",A_surfxml_include_file);
-  xbt_dynar_push(surf_file_to_parse_stack, &surf_file_to_parse); //save old filename
+  XBT_DEBUG("STag_surfxml_include '%s'",A_surfxml_include_file);
+  xbt_dynar_push(surf_parsed_filename_stack,&surf_parsed_filename); // save old file name
+  surf_parsed_filename = xbt_strdup(A_surfxml_include_file);
 
-  surf_file_to_parse = surf_fopen(A_surfxml_include_file, "r"); // read new filename
+  xbt_dynar_push(surf_file_to_parse_stack, &surf_file_to_parse); //save old file descriptor
+
+  surf_file_to_parse = surf_fopen(A_surfxml_include_file, "r"); // read new file descriptor
   xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n",
               A_surfxml_include_file);
   xbt_dynar_push(surf_input_buffer_stack,&surf_input_buffer);
   surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE);
   surf_parse_push_buffer_state(surf_input_buffer);
+
   fflush(NULL);
 }
 
@@ -122,106 +182,47 @@ void ETag_surfxml_include(void) {
  *
  * Yeah, that's terribly hackish, but it works. A better solution should be dealed with in flexml
  * directly: a command line flag could instruct it to do the correct thing when #include is encountered
- * on a line.
+ * on a line. One day maybe, if the maya allow it.
  */
 int ETag_surfxml_include_state(void)
 {
   fflush(NULL);
-  XBT_INFO("ETag_surfxml_include_state '%s'",A_surfxml_include_file);
-  if(xbt_dynar_length(surf_input_buffer_stack)!= 0)
-	  return 1;
+  XBT_DEBUG("ETag_surfxml_include_state '%s'",A_surfxml_include_file);
+
+  if(xbt_dynar_is_empty(surf_input_buffer_stack)) // nope, that's a true premature EOF. Let the parser die verbosely.
+    return 0;
+
+  // Yeah, we were in an <include> Restore state and proceed.
   fclose(surf_file_to_parse);
   xbt_dynar_pop(surf_file_to_parse_stack, &surf_file_to_parse);
   surf_parse_pop_buffer_state();
-  xbt_dynar_pop(surf_input_buffer_stack,surf_input_buffer);
-  return 0;
+  xbt_dynar_pop(surf_input_buffer_stack,&surf_input_buffer);
+
+  // Restore the filename for error messages
+  free(surf_parsed_filename);
+  xbt_dynar_pop(surf_parsed_filename_stack,&surf_parsed_filename);
+
+  return 1;
 }
 
 
 void surf_parse_init_callbacks(void)
 {
-	  sg_platf_init(); // FIXME: move to a proper place?
-
-	  STag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  ETag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  STag_surfxml_link_ctn_cb_list =
-	      xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  ETag_surfxml_link_ctn_cb_list =
-	      xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  STag_surfxml_process_cb_list =
-	      xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  ETag_surfxml_process_cb_list =
-	      xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  STag_surfxml_argument_cb_list =
-	      xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  ETag_surfxml_argument_cb_list =
-	      xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  STag_surfxml_prop_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  ETag_surfxml_prop_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  STag_surfxml_trace_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  ETag_surfxml_trace_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  STag_surfxml_trace_connect_cb_list =
-	      xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  ETag_surfxml_trace_connect_cb_list =
-	      xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  STag_surfxml_random_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  ETag_surfxml_random_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  STag_surfxml_ASroute_cb_list =
-	      xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  ETag_surfxml_ASroute_cb_list =
-	      xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  STag_surfxml_bypassRoute_cb_list =
-	      xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  ETag_surfxml_bypassRoute_cb_list =
-	      xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  STag_surfxml_peer_cb_list =
-	      xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  ETag_surfxml_peer_cb_list =
-	      xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  STag_surfxml_include_cb_list =
-			  xbt_dynar_new(sizeof(void_f_void_t), NULL);
-	  ETag_surfxml_include_cb_list =
-			  xbt_dynar_new(sizeof(void_f_void_t), NULL);
+    sg_platf_init();
 }
 
 void surf_parse_reset_callbacks(void)
 {
-	surf_parse_free_callbacks();
-	surf_parse_init_callbacks();
+  surf_parse_free_callbacks();
+  surf_parse_init_callbacks();
 }
 
 void surf_parse_free_callbacks(void)
 {
-  sg_platf_exit(); // FIXME: better place?
-
-  xbt_dynar_free(&STag_surfxml_route_cb_list);
-  xbt_dynar_free(&ETag_surfxml_route_cb_list);
-  xbt_dynar_free(&STag_surfxml_link_ctn_cb_list);
-  xbt_dynar_free(&ETag_surfxml_link_ctn_cb_list);
-  xbt_dynar_free(&STag_surfxml_process_cb_list);
-  xbt_dynar_free(&ETag_surfxml_process_cb_list);
-  xbt_dynar_free(&STag_surfxml_argument_cb_list);
-  xbt_dynar_free(&ETag_surfxml_argument_cb_list);
-  xbt_dynar_free(&STag_surfxml_prop_cb_list);
-  xbt_dynar_free(&ETag_surfxml_prop_cb_list);
-  xbt_dynar_free(&STag_surfxml_trace_cb_list);
-  xbt_dynar_free(&ETag_surfxml_trace_cb_list);
-  xbt_dynar_free(&STag_surfxml_trace_connect_cb_list);
-  xbt_dynar_free(&ETag_surfxml_trace_connect_cb_list);
-  xbt_dynar_free(&STag_surfxml_random_cb_list);
-  xbt_dynar_free(&ETag_surfxml_random_cb_list);
-  xbt_dynar_free(&STag_surfxml_ASroute_cb_list);
-  xbt_dynar_free(&ETag_surfxml_ASroute_cb_list);
-  xbt_dynar_free(&STag_surfxml_bypassRoute_cb_list);
-  xbt_dynar_free(&ETag_surfxml_bypassRoute_cb_list);
-  xbt_dynar_free(&STag_surfxml_peer_cb_list);
-  xbt_dynar_free(&ETag_surfxml_peer_cb_list);
-  xbt_dynar_free(&STag_surfxml_include_cb_list);
-  xbt_dynar_free(&ETag_surfxml_include_cb_list);
+  sg_platf_exit();
 }
 
 /* Stag and Etag parse functions */
-void ETag_surfxml_router(void)  { /* ignored -- do not add content here */ }
 
 void STag_surfxml_platform(void) {
   _XBT_GNUC_UNUSED double version = surf_parse_get_double(A_surfxml_platform_version);
@@ -253,58 +254,78 @@ void ETag_surfxml_platform(void){
 }
 
 void STag_surfxml_host(void){
-  s_sg_platf_host_cbarg_t host;
-  memset(&host,0,sizeof(host));
-
   xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
-  host.properties = current_property_set = xbt_dict_new();
-
-	host.id = A_surfxml_host_id;
-	host.power_peak = get_cpu_power(A_surfxml_host_power);
-	host.power_scale = surf_parse_get_double( A_surfxml_host_availability);
-	host.core_amount = surf_parse_get_int(A_surfxml_host_core);
-	host.power_trace = tmgr_trace_new(A_surfxml_host_availability_file);
-	host.state_trace = tmgr_trace_new(A_surfxml_host_state_file);
-	xbt_assert((A_surfxml_host_state == A_surfxml_host_state_ON) ||
-			  (A_surfxml_host_state == A_surfxml_host_state_OFF), "Invalid state");
-	if (A_surfxml_host_state == A_surfxml_host_state_ON)
-		host.initial_state = SURF_RESOURCE_ON;
-	if (A_surfxml_host_state == A_surfxml_host_state_OFF)
-		host.initial_state = SURF_RESOURCE_OFF;
-	host.coord = A_surfxml_host_coordinates;
-
-	sg_platf_new_host(&host);
 }
+
+void STag_surfxml_prop(void)
+{
+  if (!current_property_set)
+    current_property_set = xbt_dict_new_homogeneous(xbt_free_f); // Maybe, it should raise an error
+
+  xbt_dict_set(current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), NULL);
+}
+
 void ETag_surfxml_host(void)    {
+  s_sg_platf_host_cbarg_t host;
+  memset(&host,0,sizeof(host));
+
+  host.properties = current_property_set;
+
+  host.id = A_surfxml_host_id;
+  host.power_peak = get_cpu_power(A_surfxml_host_power);
+  host.power_scale = surf_parse_get_double( A_surfxml_host_availability);
+  host.core_amount = surf_parse_get_int(A_surfxml_host_core);
+  host.power_trace = tmgr_trace_new_from_file(A_surfxml_host_availability_file);
+  host.state_trace = tmgr_trace_new_from_file(A_surfxml_host_state_file);
+  xbt_assert((A_surfxml_host_state == A_surfxml_host_state_ON) ||
+        (A_surfxml_host_state == A_surfxml_host_state_OFF), "Invalid state");
+  if (A_surfxml_host_state == A_surfxml_host_state_ON)
+    host.initial_state = SURF_RESOURCE_ON;
+  if (A_surfxml_host_state == A_surfxml_host_state_OFF)
+    host.initial_state = SURF_RESOURCE_OFF;
+  host.coord = A_surfxml_host_coordinates;
+
+  sg_platf_new_host(&host);
   current_property_set = NULL;
 }
 
+void STag_surfxml_host_link(void){
+  XBT_DEBUG("Create a Host_link for %s",A_surfxml_host_link_id);
+  s_sg_platf_host_link_cbarg_t host_link;
+  memset(&host_link,0,sizeof(host_link));
+
+  host_link.id = A_surfxml_host_link_id;
+  host_link.link_up = A_surfxml_host_link_up;
+  host_link.link_down = A_surfxml_host_link_down;
+  sg_platf_new_host_link(&host_link);
+}
+
 void STag_surfxml_router(void){
   s_sg_platf_router_cbarg_t router;
   memset(&router, 0, sizeof(router));
 
-	router.id = A_surfxml_router_id;
-	router.coord = A_surfxml_router_coordinates;
+  router.id = A_surfxml_router_id;
+  router.coord = A_surfxml_router_coordinates;
 
-	sg_platf_new_router(&router);
+  sg_platf_new_router(&router);
 }
 
 void STag_surfxml_cluster(void){
   s_sg_platf_cluster_cbarg_t cluster;
   memset(&cluster,0,sizeof(cluster));
-	cluster.id = A_surfxml_cluster_id;
-	cluster.prefix = A_surfxml_cluster_prefix;
-	cluster.suffix = A_surfxml_cluster_suffix;
-	cluster.radical = A_surfxml_cluster_radical;
-	cluster.power= surf_parse_get_double(A_surfxml_cluster_power);
-	cluster.core_amount = surf_parse_get_int(A_surfxml_cluster_core);
-	cluster.bw =   surf_parse_get_double(A_surfxml_cluster_bw);
-	cluster.lat =  surf_parse_get_double(A_surfxml_cluster_lat);
-	if(strcmp(A_surfxml_cluster_bb_bw,""))
-	  cluster.bb_bw = surf_parse_get_double(A_surfxml_cluster_bb_bw);
-	if(strcmp(A_surfxml_cluster_bb_lat,""))
-	  cluster.bb_lat = surf_parse_get_double(A_surfxml_cluster_bb_lat);
-	cluster.router_id = A_surfxml_cluster_router_id;
+  cluster.id = A_surfxml_cluster_id;
+  cluster.prefix = A_surfxml_cluster_prefix;
+  cluster.suffix = A_surfxml_cluster_suffix;
+  cluster.radical = A_surfxml_cluster_radical;
+  cluster.power= surf_parse_get_double(A_surfxml_cluster_power);
+  cluster.core_amount = surf_parse_get_int(A_surfxml_cluster_core);
+  cluster.bw =   surf_parse_get_double(A_surfxml_cluster_bw);
+  cluster.lat =  surf_parse_get_double(A_surfxml_cluster_lat);
+  if(strcmp(A_surfxml_cluster_bb_bw,""))
+    cluster.bb_bw = surf_parse_get_double(A_surfxml_cluster_bb_bw);
+  if(strcmp(A_surfxml_cluster_bb_lat,""))
+    cluster.bb_lat = surf_parse_get_double(A_surfxml_cluster_bb_lat);
+  cluster.router_id = A_surfxml_cluster_router_id;
 
   switch (AX_surfxml_cluster_sharing_policy) {
   case A_surfxml_cluster_sharing_policy_SHARED:
@@ -317,9 +338,8 @@ void STag_surfxml_cluster(void){
     cluster.sharing_policy = SURF_LINK_FATPIPE;
     break;
   default:
-    surf_parse_error(bprintf
-                     ("Invalid cluster sharing policy for cluster %s",
-                      cluster.id));
+    surf_parse_error("Invalid cluster sharing policy for cluster %s",
+                     cluster.id);
     break;
   }
   switch (AX_surfxml_cluster_bb_sharing_policy) {
@@ -330,121 +350,283 @@ void STag_surfxml_cluster(void){
     cluster.bb_sharing_policy = SURF_LINK_SHARED;
     break;
   default:
-    surf_parse_error(bprintf
-                     ("Invalid bb sharing policy in cluster %s",
-                      cluster.id));
+    surf_parse_error("Invalid bb sharing policy in cluster %s",
+                     cluster.id);
     break;
   }
 
-	cluster.availability_trace = A_surfxml_cluster_availability_file;
-	cluster.state_trace = A_surfxml_cluster_state_file;
-	sg_platf_new_cluster(&cluster);
+  cluster.availability_trace = A_surfxml_cluster_availability_file;
+  cluster.state_trace = A_surfxml_cluster_state_file;
+  sg_platf_new_cluster(&cluster);
 }
-void ETag_surfxml_cluster(void){
-  /* nothing I can think of */
+
+void STag_surfxml_cabinet(void){
+  s_sg_platf_cabinet_cbarg_t cabinet;
+  memset(&cabinet,0,sizeof(cabinet));
+  cabinet.id = A_surfxml_cabinet_id;
+  cabinet.prefix = A_surfxml_cabinet_prefix;
+  cabinet.suffix = A_surfxml_cabinet_suffix;
+  cabinet.power = surf_parse_get_double(A_surfxml_cabinet_power);
+  cabinet.bw = surf_parse_get_double(A_surfxml_cabinet_bw);
+  cabinet.lat = surf_parse_get_double(A_surfxml_cabinet_lat);
+  cabinet.radical = A_surfxml_cabinet_radical;
+
+  sg_platf_new_cabinet(&cabinet);
 }
 
 void STag_surfxml_peer(void){
   s_sg_platf_peer_cbarg_t peer;
   memset(&peer,0,sizeof(peer));
-	peer.id = A_surfxml_peer_id;
-	peer.power = surf_parse_get_double(A_surfxml_peer_power);
-	peer.bw_in = surf_parse_get_double(A_surfxml_peer_bw_in);
-	peer.bw_out = surf_parse_get_double(A_surfxml_peer_bw_out);
-	peer.lat = surf_parse_get_double(A_surfxml_peer_lat);
-	peer.coord = A_surfxml_peer_coordinates;
-	peer.availability_trace = tmgr_trace_new(A_surfxml_peer_availability_file);
-	peer.state_trace = tmgr_trace_new(A_surfxml_peer_state_file);
+  peer.id = A_surfxml_peer_id;
+  peer.power = surf_parse_get_double(A_surfxml_peer_power);
+  peer.bw_in = surf_parse_get_double(A_surfxml_peer_bw_in);
+  peer.bw_out = surf_parse_get_double(A_surfxml_peer_bw_out);
+  peer.lat = surf_parse_get_double(A_surfxml_peer_lat);
+  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);
 
-	surfxml_call_cb_functions(STag_surfxml_peer_cb_list);
-	sg_platf_new_peer(&peer);
-}
-void ETag_surfxml_peer(void){
-  /* nothing to do here */
+  sg_platf_new_peer(&peer);
 }
+
 void STag_surfxml_link(void){
+  xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
+}
+
+void ETag_surfxml_link(void){
   s_sg_platf_link_cbarg_t link;
   memset(&link,0,sizeof(link));
 
-  xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
-  link.properties = current_property_set = xbt_dict_new();
-
-	link.id = A_surfxml_link_id;
-	link.bandwidth = surf_parse_get_double(A_surfxml_link_bandwidth);
-	link.bandwidth_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file);
-	link.latency = surf_parse_get_double(A_surfxml_link_latency);
-	link.latency_trace = tmgr_trace_new(A_surfxml_link_latency_file);
-
-	switch (A_surfxml_link_state) {
-	case A_surfxml_link_state_ON:
-		link.state = SURF_RESOURCE_ON;
-		break;
-	case A_surfxml_link_state_OFF:
-		link.state = SURF_RESOURCE_OFF;
-		break;
-	default:
-	  surf_parse_error(bprintf("invalid state for link %s",link.id));
-	}
-	link.state_trace = tmgr_trace_new(A_surfxml_link_state_file);
-
-	switch (A_surfxml_link_sharing_policy) {
-	case A_surfxml_link_sharing_policy_SHARED:
-		link.policy = SURF_LINK_SHARED;
-		break;
-	case A_surfxml_link_sharing_policy_FATPIPE:
-		 link.policy = SURF_LINK_FATPIPE;
-		 break;
-	case A_surfxml_link_sharing_policy_FULLDUPLEX:
-		 link.policy = SURF_LINK_FULLDUPLEX;
-		 break;
-	default:
-	  surf_parse_error(bprintf("Invalid sharing policy in link %s",link.id));
-	}
-
-	sg_platf_new_link(&link);
+  link.properties = current_property_set;
+
+  link.id = A_surfxml_link_id;
+  link.bandwidth = surf_parse_get_double(A_surfxml_link_bandwidth);
+  link.bandwidth_trace = tmgr_trace_new_from_file(A_surfxml_link_bandwidth_file);
+  link.latency = surf_parse_get_double(A_surfxml_link_latency);
+  link.latency_trace = tmgr_trace_new_from_file(A_surfxml_link_latency_file);
+
+  switch (A_surfxml_link_state) {
+  case A_surfxml_link_state_ON:
+    link.state = SURF_RESOURCE_ON;
+    break;
+  case A_surfxml_link_state_OFF:
+    link.state = SURF_RESOURCE_OFF;
+    break;
+  default:
+    surf_parse_error("invalid state for link %s", link.id);
+    break;
+  }
+  link.state_trace = tmgr_trace_new_from_file(A_surfxml_link_state_file);
+
+  switch (A_surfxml_link_sharing_policy) {
+  case A_surfxml_link_sharing_policy_SHARED:
+    link.policy = SURF_LINK_SHARED;
+    break;
+  case A_surfxml_link_sharing_policy_FATPIPE:
+     link.policy = SURF_LINK_FATPIPE;
+     break;
+  case A_surfxml_link_sharing_policy_FULLDUPLEX:
+     link.policy = SURF_LINK_FULLDUPLEX;
+     break;
+  default:
+    surf_parse_error("Invalid sharing policy in link %s", link.id);
+    break;
+  }
+
+  sg_platf_new_link(&link);
+
+  current_property_set = NULL;
 }
-void ETag_surfxml_link(void){
+
+void STag_surfxml_link_ctn(void){
+
+  char *link_id;
+  switch (A_surfxml_link_ctn_direction) {
+  case AU_surfxml_link_ctn_direction:
+  case A_surfxml_link_ctn_direction_NONE:
+    link_id = xbt_strdup(A_surfxml_link_ctn_id);
+    break;
+  case A_surfxml_link_ctn_direction_UP:
+    link_id = bprintf("%s_UP", A_surfxml_link_ctn_id);
+    break;
+  case A_surfxml_link_ctn_direction_DOWN:
+    link_id = bprintf("%s_DOWN", A_surfxml_link_ctn_id);
+    break;
+  }
+
+  // FIXME we should push the surf link object but it don't
+  // work because of model rulebased
+  xbt_dynar_push(parsed_link_list, &link_id);
+}
+
+void ETag_surfxml_backbone(void){
+  s_sg_platf_link_cbarg_t link;
+  memset(&link,0,sizeof(link));
+
+  link.properties = NULL;
+
+  link.id = A_surfxml_backbone_id;
+  link.bandwidth = surf_parse_get_double(A_surfxml_backbone_bandwidth);
+  link.latency = surf_parse_get_double(A_surfxml_backbone_latency);
+  link.state = SURF_RESOURCE_ON;
+  link.policy = SURF_LINK_SHARED;
+
+  sg_platf_new_link(&link);
+  routing_cluster_add_backbone(xbt_lib_get_or_null(link_lib, A_surfxml_backbone_id, SURF_LINK_LEVEL));
   current_property_set = NULL;
 }
 
 void STag_surfxml_route(void){
-	surfxml_call_cb_functions(STag_surfxml_route_cb_list);
+  xbt_assert(strlen(A_surfxml_route_src) > 0 || strlen(A_surfxml_route_dst) > 0,
+      "Missing end-points while defining route \"%s\"->\"%s\"",
+      A_surfxml_route_src, A_surfxml_route_dst);
+  parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
 }
-void STag_surfxml_link_ctn(void){
-	surfxml_call_cb_functions(STag_surfxml_link_ctn_cb_list);
+void STag_surfxml_ASroute(void){
+  xbt_assert(strlen(A_surfxml_ASroute_src) > 0 || strlen(A_surfxml_ASroute_dst) > 0
+      || strlen(A_surfxml_ASroute_gw_src) > 0 || strlen(A_surfxml_ASroute_gw_dst) > 0,
+      "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)",
+      A_surfxml_ASroute_src, A_surfxml_ASroute_dst,
+      A_surfxml_ASroute_gw_src,A_surfxml_ASroute_gw_dst);
+  parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
 }
-void STag_surfxml_process(void){
-	surfxml_call_cb_functions(STag_surfxml_process_cb_list);
+void STag_surfxml_bypassRoute(void){
+  xbt_assert(strlen(A_surfxml_bypassRoute_src) > 0 || strlen(A_surfxml_bypassRoute_dst) > 0,
+      "Missing end-points while defining bupass route \"%s\"->\"%s\"",
+      A_surfxml_bypassRoute_src, A_surfxml_bypassRoute_dst);
+  parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
+}
+void STag_surfxml_bypassASroute(void){
+  xbt_assert(strlen(A_surfxml_bypassASroute_src) > 0 || strlen(A_surfxml_bypassASroute_dst) > 0
+      || strlen(A_surfxml_bypassASroute_gw_src) > 0 || strlen(A_surfxml_bypassASroute_gw_dst) > 0,
+      "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)",
+      A_surfxml_bypassASroute_src, A_surfxml_bypassASroute_dst,
+      A_surfxml_bypassASroute_gw_src,A_surfxml_bypassASroute_gw_dst);
+  parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
+}
+
+void ETag_surfxml_route(void){
+  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.link_list = parsed_link_list;
+
+  switch (A_surfxml_route_symmetrical) {
+  case AU_surfxml_route_symmetrical:
+  case A_surfxml_route_symmetrical_YES:
+    route.symmetrical = TRUE;
+    break;
+  case A_surfxml_route_symmetrical_NO:
+    route.symmetrical = FALSE;;
+    break;
+  }
+
+  sg_platf_new_route(&route);
+  parsed_link_list = NULL;
 }
-void STag_surfxml_argument(void){
-	surfxml_call_cb_functions(STag_surfxml_argument_cb_list);
+
+void ETag_surfxml_ASroute(void){
+  s_sg_platf_ASroute_cbarg_t ASroute;
+  memset(&ASroute,0,sizeof(ASroute));
+
+  ASroute.src = A_surfxml_ASroute_src;
+  ASroute.dst = A_surfxml_ASroute_dst;
+  ASroute.gw_src = A_surfxml_ASroute_gw_src;
+  ASroute.gw_dst = A_surfxml_ASroute_gw_dst;
+  ASroute.link_list = parsed_link_list;
+
+  switch (A_surfxml_ASroute_symmetrical) {
+  case AU_surfxml_ASroute_symmetrical:
+  case A_surfxml_ASroute_symmetrical_YES:
+    ASroute.symmetrical = TRUE;
+    break;
+  case A_surfxml_ASroute_symmetrical_NO:
+    ASroute.symmetrical = FALSE;;
+    break;
+  }
+
+  sg_platf_new_ASroute(&ASroute);
+  parsed_link_list = NULL;
 }
-void STag_surfxml_prop(void){
-	surfxml_call_cb_functions(STag_surfxml_prop_cb_list);
+
+void ETag_surfxml_bypassRoute(void){
+  s_sg_platf_bypassRoute_cbarg_t route;
+  memset(&route,0,sizeof(route));
+
+  route.src = A_surfxml_bypassRoute_src;
+  route.dst = A_surfxml_bypassRoute_dst;
+  route.link_list = parsed_link_list;
+
+  sg_platf_new_bypassRoute(&route);
+  parsed_link_list = NULL;
 }
-void STag_surfxml_trace(void){
-	surfxml_call_cb_functions(STag_surfxml_trace_cb_list);
+
+void ETag_surfxml_bypassASroute(void){
+  s_sg_platf_bypassASroute_cbarg_t ASroute;
+  memset(&ASroute,0,sizeof(ASroute));
+
+  ASroute.src = A_surfxml_bypassASroute_src;
+  ASroute.dst = A_surfxml_bypassASroute_dst;
+  ASroute.gw_src = A_surfxml_bypassASroute_gw_src;
+  ASroute.gw_dst = A_surfxml_bypassASroute_gw_dst;
+  ASroute.link_list = parsed_link_list;
+
+  sg_platf_new_bypassASroute(&ASroute);
+  parsed_link_list = NULL;
+}
+
+void ETag_surfxml_trace(void){
+  s_sg_platf_trace_cbarg_t trace;
+  memset(&trace,0,sizeof(trace));
+
+  trace.id = A_surfxml_trace_id;
+  trace.file = A_surfxml_trace_file;
+  trace.periodicity = surf_parse_get_double(A_surfxml_trace_periodicity);
+  trace.pc_data = surfxml_pcdata;
+
+  sg_platf_new_trace(&trace);
 }
+
 void STag_surfxml_trace_connect(void){
-	surfxml_call_cb_functions(STag_surfxml_trace_connect_cb_list);
+  s_sg_platf_trace_connect_cbarg_t trace_connect;
+  memset(&trace_connect,0,sizeof(trace_connect));
+
+  trace_connect.element = A_surfxml_trace_connect_element;
+  trace_connect.trace = A_surfxml_trace_connect_trace;
+
+  switch (A_surfxml_trace_connect_kind) {
+  case AU_surfxml_trace_connect_kind:
+  case A_surfxml_trace_connect_kind_POWER:
+    trace_connect.kind =  SURF_TRACE_CONNECT_KIND_POWER;
+    break;
+  case A_surfxml_trace_connect_kind_BANDWIDTH:
+    trace_connect.kind =  SURF_TRACE_CONNECT_KIND_BANDWIDTH;
+    break;
+  case A_surfxml_trace_connect_kind_HOST_AVAIL:
+    trace_connect.kind =  SURF_TRACE_CONNECT_KIND_HOST_AVAIL;
+    break;
+  case A_surfxml_trace_connect_kind_LATENCY:
+    trace_connect.kind =  SURF_TRACE_CONNECT_KIND_LATENCY;
+    break;
+  case A_surfxml_trace_connect_kind_LINK_AVAIL:
+    trace_connect.kind =  SURF_TRACE_CONNECT_KIND_LINK_AVAIL;
+    break;
+  }
+  sg_platf_new_trace_connect(&trace_connect);
 }
+
 void STag_surfxml_AS(void){
-  sg_platf_new_AS_begin(A_surfxml_AS_id,A_surfxml_AS_routing);
+  sg_platf_new_AS_begin(A_surfxml_AS_id, (int)A_surfxml_AS_routing);
 }
 void ETag_surfxml_AS(void){
   sg_platf_new_AS_end();
 }
-void STag_surfxml_ASroute(void){
-	surfxml_call_cb_functions(STag_surfxml_ASroute_cb_list);
-}
-void STag_surfxml_bypassRoute(void){
-	surfxml_call_cb_functions(STag_surfxml_bypassRoute_cb_list);
-}
+
 void STag_surfxml_config(void){
   XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);
   xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
-  current_property_set = xbt_dict_new();
-
 }
 void ETag_surfxml_config(void){
   xbt_dict_cursor_t cursor = NULL;
@@ -462,23 +644,62 @@ void ETag_surfxml_config(void){
   XBT_DEBUG("End configuration name = %s",A_surfxml_config_id);
   xbt_dict_free(&current_property_set);
 }
-void STag_surfxml_random(void){
-	surfxml_call_cb_functions(STag_surfxml_random_cb_list);
+
+static int argc;
+static char **argv;
+
+void STag_surfxml_process(void){
+  argc = 1;
+  argv = xbt_new(char *, 1);
+  argv[0] = xbt_strdup(A_surfxml_process_function);
+}
+
+void ETag_surfxml_process(void){
+  s_sg_platf_process_cbarg_t process;
+  memset(&process,0,sizeof(process));
+
+  process.argc = argc;
+  process.argv = (const char **)argv;
+  process.properties = current_property_set;
+  process.host = A_surfxml_process_host;
+  process.function = A_surfxml_process_function;
+  process.start_time = surf_parse_get_double(A_surfxml_process_start_time);
+  process.kill_time = surf_parse_get_double(A_surfxml_process_kill_time);
+
+  switch (A_surfxml_process_on_failure) {
+  case AU_surfxml_process_on_failure:
+  case A_surfxml_process_on_failure_DIE:
+    process.on_failure =  SURF_PROCESS_ON_FAILURE_DIE;
+    break;
+  case A_surfxml_process_on_failure_RESTART:
+    process.on_failure =  SURF_PROCESS_ON_FAILURE_RESTART;
+    break;
+  }
+
+  sg_platf_new_process(&process);
+  current_property_set = NULL;
 }
 
-#define parse_method(type,name) \
-void type##Tag_surfxml_##name(void) \
-{ surfxml_call_cb_functions(type##Tag_surfxml_##name##_cb_list); }
-parse_method(E, route);
-parse_method(E, link_ctn);
-parse_method(E, process);
-parse_method(E, argument);
-parse_method(E, prop);
-parse_method(E, trace);
-parse_method(E, trace_connect);
-parse_method(E, random);
-parse_method(E, ASroute);
-parse_method(E, bypassRoute);
+void STag_surfxml_argument(void){
+  argc++;
+  argv = xbt_realloc(argv, (argc) * sizeof(char *));
+  argv[(argc) - 1] = xbt_strdup(A_surfxml_argument_value);
+}
+
+/* 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){}
+void ETag_surfxml_router(void){}
+void ETag_surfxml_host_link(void){}
+void ETag_surfxml_cluster(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){}
 
 /* Open and Close parse file */
 
@@ -500,6 +721,10 @@ void surf_parse_open(const char *file)
   if (!surf_file_to_parse_stack)
     surf_file_to_parse_stack = xbt_dynar_new(sizeof(FILE *), NULL);
 
+  if (!surf_parsed_filename_stack)
+    surf_parsed_filename_stack = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
+  surf_parsed_filename = xbt_strdup(file);
+
   surf_file_to_parse = surf_fopen(file, "r");
   xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n", file);
   surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE);
@@ -511,6 +736,9 @@ void surf_parse_close(void)
 {
   xbt_dynar_free(&surf_input_buffer_stack);
   xbt_dynar_free(&surf_file_to_parse_stack);
+  xbt_dynar_free(&surf_parsed_filename_stack);
+
+  free(surf_parsed_filename);
 
   if (surf_file_to_parse) {
     surf_parse__delete_buffer(surf_input_buffer);
@@ -527,72 +755,11 @@ static int _surf_parse(void) {
 int_f_void_t surf_parse = _surf_parse;
 
 
-/* Aux parse functions */
-
-void surfxml_add_callback(xbt_dynar_t cb_list, void_f_void_t function)
-{
-  xbt_dynar_push(cb_list, &function);
-}
-
-void surfxml_del_callback(xbt_dynar_t cb_list, void_f_void_t function)
-{
-  xbt_ex_t e;
-  unsigned int it=0;
-  void_f_void_t null_f=NULL;
-
-  TRY {
-    it = xbt_dynar_search(cb_list,&function);
-  }
-  CATCH(e) {
-    if (e.category == not_found_error) {
-      xbt_ex_free(e);
-      xbt_die("Trying to remove a callback that is not here! This should not happen");
-    }
-    RETHROW;
-  }
-
-  xbt_dynar_replace(cb_list, it,&null_f);
-}
-
-static XBT_INLINE void surfxml_call_cb_functions(xbt_dynar_t cb_list)
-{
-  unsigned int iterator;
-  void_f_void_t fun;
-  xbt_dynar_foreach(cb_list, iterator, fun) {
-    if (fun) fun();
-  }
-}
-
-
 /* Prop tag functions */
 
-void parse_properties(const char* prop_id, const char* prop_value)
-{
-	if (!current_property_set)
-	    current_property_set = xbt_dict_new();      // Maybe, it should raise an error
-	if(!strcmp(prop_id,"coordinates")){
-		if(!strcmp(prop_value,"yes") && !COORD_HOST_LEVEL)
-		  {
-			    XBT_INFO("Configuration change: Set '%s' to '%s'", prop_id, prop_value);
-				COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_dynar_free_voidp);
-				COORD_ASR_LEVEL  = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp);
-		  }
-		if(strcmp(A_surfxml_prop_value,"yes"))
-			  xbt_die("Setting XML prop coordinates must be \"yes\"");
-	  }
-	else{
-		  xbt_dict_set(current_property_set, prop_id, xbt_strdup(prop_value), free);
-	 }
-}
-
 /**
  * With XML parser
  */
-void parse_properties_XML(void)
-{
-  parse_properties(A_surfxml_prop_id, A_surfxml_prop_value);
-}
-
 
 /* Random tag functions */
 
@@ -619,8 +786,8 @@ double get_cpu_power(const char *power)
   return power_scale;
 }
 
-double random_min, random_max, random_mean, random_std_deviation,
-    random_generator;
+double random_min, random_max, random_mean, random_std_deviation;
+e_random_generator_t random_generator;
 char *random_id;
 
 static void init_randomness(void)
@@ -630,7 +797,24 @@ static void init_randomness(void)
   random_max = surf_parse_get_double(A_surfxml_random_max);
   random_mean = surf_parse_get_double(A_surfxml_random_mean);
   random_std_deviation = surf_parse_get_double(A_surfxml_random_std_deviation);
-  random_generator = A_surfxml_random_generator;
+  switch (A_surfxml_random_generator) {
+  case AU_surfxml_random_generator:
+  case A_surfxml_random_generator_NONE:
+    random_generator = NONE;
+    break;
+  case A_surfxml_random_generator_DRAND48:
+    random_generator = DRAND48;
+    break;
+  case A_surfxml_random_generator_RAND:
+    random_generator = RAND;
+    break;
+  case A_surfxml_random_generator_RNGSTREAM:
+    random_generator = RNGSTREAM;
+    break;
+  default:
+    surf_parse_error("Invalid random generator");
+    break;
+  }
 }
 
 static void add_randomness(void)