Do routing parse before tracing parse

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 8efa22a..c2dbd83 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -597,8 +597,8 @@ static void _get_route_and_latency(network_element_t src, network_element_t dst,
 /**
  * \brief Find a route between hosts
  *
- * \param src the source host name
- * \param dst the destination host name
+ * \param src the network_element_t for src host
+ * \param dst the network_element_t for dst host
  * \param route where to store the list of links.
  *              If *route=NULL, create a short lived dynar. Else, fill the provided dynar
  * \param latency where to store the latency experienced on the path (or NULL if not interested)
@@ -1236,6 +1236,10 @@ void routing_register_callbacks()
   sg_platf_storage_type_add_cb(routing_parse_storage_type);
   sg_platf_mount_add_cb(routing_parse_mount);
 
+  /* we care about the ASes while parsing the platf. Incredible, isnt it? */
+  sg_platf_AS_end_add_cb(routing_AS_end);
+  sg_platf_AS_begin_add_cb(routing_AS_begin);
+
 #ifdef HAVE_TRACING
   instr_routing_define_callbacks();
 #endif

diff --git a/src/surf/surfxml_parseplatf.c b/src/surf/surfxml_parseplatf.c
index 57a766a..ca7cd66 100644 (file)
--- a/src/surf/surfxml_parseplatf.c
+++ b/src/surf/surfxml_parseplatf.c
@@ -162,11 +162,6 @@ void parse_platform_file(const char *file)
   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? */
-  sg_platf_AS_end_add_cb(routing_AS_end);
-  sg_platf_AS_begin_add_cb(routing_AS_begin);
-
-
   /* Do the actual parsing */
   parse_status = surf_parse();