[trace] new callback to end of platform parsing

[simgrid.git] / src / instr / instr_routing.c

diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c
index 7a640a2..d01481e 100644 (file)
--- a/src/instr/instr_routing.c
+++ b/src/instr/instr_routing.c
@@ -15,15 +15,15 @@ extern xbt_dict_t defined_types; /* from instr_interface.c */
 
 typedef struct s_container *container_t;
 typedef struct s_container {
-  char *name;
-  char *type;
-  int level;
+  char *name;     /* Unique id of this container */
+  char *type;     /* Type of this container */
+  int level;      /* Level in the hierarchy, root level is 0 */
   struct s_container *father;
   xbt_dict_t children;
 }s_container_t;
 
-static container_t rootContainer = NULL;
-static xbt_dynar_t currentContainer = NULL;
+static container_t rootContainer = NULL;    /* the root container */
+static xbt_dynar_t currentContainer = NULL; /* push and pop, used only in creation */
 static xbt_dict_t allContainers = NULL;     /* all created containers indexed by name */
 xbt_dict_t hosts_types = NULL;
 xbt_dict_t links_types = NULL;
@@ -36,6 +36,7 @@ static void instr_routing_parse_start_host (void);
 static void instr_routing_parse_end_host (void);
 static void instr_routing_parse_start_router (void);
 static void instr_routing_parse_end_router (void);
+static void instr_routing_parse_end_platform (void);
 static char *instr_AS_type (int level);
 
 static char *instr_AS_type (int level)
@@ -84,6 +85,7 @@ void instr_routing_define_callbacks ()
   surfxml_add_callback(ETag_surfxml_host_cb_list, &instr_routing_parse_end_host);
   surfxml_add_callback(STag_surfxml_router_cb_list, &instr_routing_parse_start_router);
   surfxml_add_callback(ETag_surfxml_router_cb_list, &instr_routing_parse_end_router);
+  surfxml_add_callback(ETag_surfxml_platform_cb_list, &instr_routing_parse_end_platform);
 }
 
 
@@ -243,6 +245,11 @@ static void instr_routing_parse_end_router ()
 {
 }
 
+static void instr_routing_parse_end_platform ()
+{
+  currentContainer = NULL;
+}
+
 /*
  * Support functions
  */