X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/513baa2ee64b3db9b8697c61123715e6892afb4e..b9c9ef88e5a31a819e1f197b563974705e6d6805:/src/surf/surfxml_parseplatf.c

diff --git a/src/surf/surfxml_parseplatf.c b/src/surf/surfxml_parseplatf.c
index 6b906efa4f..f1d0d4bd46 100644
--- a/src/surf/surfxml_parseplatf.c
+++ b/src/surf/surfxml_parseplatf.c
@@ -8,6 +8,7 @@
 #include "xbt/log.h"
 #include "xbt/str.h"
 #include "xbt/dict.h"
+#include "simgrid/platf.h"
 #include "surf/surfxml_parse_private.h"
 #include "surf/surf_private.h"
 
@@ -52,12 +53,7 @@ void surfxml_bufferstack_pop(int new)
  * Pass arguments to parsing callback as structures to save some time (and allow callbacks to ignore some)
  */
 
-hostSG_t struct_host = NULL;
-router_t struct_router = NULL;
-cluster_t struct_cluster = NULL;
-peer_t struct_peer = NULL;
-link_t struct_lnk = NULL;
-
+surf_parsing_cluster_arg_t struct_cluster = NULL;
 
 /*
  * Trace related stuff
@@ -76,10 +72,9 @@ static char *trace_id = NULL;
 
 static void parse_Stag_trace(void)
 {
-  surf_parse_models_setup(); /* ensure that the models are created after the last <config> tag. See comment in simgrid.dtd */
   trace_id = xbt_strdup(A_surfxml_trace_id);
   trace_file = xbt_strdup(A_surfxml_trace_file);
-  surf_parse_get_double(&trace_periodicity, A_surfxml_trace_periodicity);
+  trace_periodicity = surf_parse_get_double(A_surfxml_trace_periodicity);
 }
 
 static void parse_Etag_trace(void)
@@ -104,8 +99,6 @@ static void parse_Etag_trace(void)
 
 static void parse_Stag_trace_connect(void)
 {
-  surf_parse_models_setup(); /* ensure that the models are created after the last <config> tag. See comment in simgrid.dtd */
-
   xbt_assert(xbt_dict_get_or_null
               (traces_set_list, A_surfxml_trace_connect_trace),
               "Cannot connect trace %s to %s: trace unknown",
@@ -143,6 +136,13 @@ static void parse_Stag_trace_connect(void)
   }
 }
 
+/* Call the right C function when we see the <AS> tags */
+static void parse_S_AS(void) {
+  sg_platf_new_AS_open(A_surfxml_AS_id, A_surfxml_AS_routing);
+}
+static void parse_E_AS(void) {
+  sg_platf_new_AS_close();
+}
 
 /* Init and free parse data */
 
@@ -162,6 +162,10 @@ static void init_data(void)
   surfxml_add_callback(ETag_surfxml_trace_cb_list, &parse_Etag_trace);
   surfxml_add_callback(STag_surfxml_trace_connect_cb_list,
              &parse_Stag_trace_connect);
+
+  /* we care about the ASes while parsing the platf. Incredible, isnt it? */
+  surfxml_add_callback(STag_surfxml_AS_cb_list, &parse_S_AS);
+  surfxml_add_callback(ETag_surfxml_AS_cb_list, &parse_E_AS);
 }
 
 static void free_data(void)
@@ -181,8 +185,10 @@ void parse_platform_file(const char *file)
 {
   int parse_status;
 
-
   surf_parse_reset_callbacks();
+
+  /* Register classical callbacks */
+  surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties_XML);
   surf_parse_add_callback_config();
 
   surfxml_buffer_stack_stack_ptr = 1;
@@ -193,7 +199,8 @@ void parse_platform_file(const char *file)
   parse_status = surf_parse();
   free_data();
   surf_parse_close();
-  xbt_assert(!parse_status, "Parse error in %s", file);
+  if (parse_status)
+    xbt_die("Parse error in %s", file);
 
   surf_config_models_create_elms();
 }