X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a09eb6556675019e53ca2566d0f9770fbe77ef82..39bbf791c23a1c90885b63c704aa37382f06d163:/src/surf/surf_routing.c

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index c7697f5e5a..942abe88be 100644
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -54,9 +54,10 @@ static void model_none_load(void);      /* none routing model */
 static void model_none_unload(void);    /* none routing model */
 static void model_none_end(void);       /* none routing model */
 
-static void routing_full_parse_Scluster(void);  /*cluster bypass */
+static void routing_parse_Scluster(void);  /*cluster bypass */
 
-static void parse_Sconfig(void);        /*config Tag */
+static void routing_parse_Sconfig(void);        /*config Tag */
+static void routing_parse_Econfig(void);        /*config Tag */
 
 /* this lines are only for replace use like index in the model table */
 typedef enum {
@@ -146,7 +147,6 @@ static char *dst = NULL;        /* temporary store the destination name of a rou
 static char *gw_src = NULL;     /* temporary store the gateway source name of a route */
 static char *gw_dst = NULL;     /* temporary store the gateway destination name of a route */
 static xbt_dynar_t link_list = NULL;    /* temporary store of current list link of a route */
-
 /**
  * \brief Add a "host" to the network element list
  */
@@ -896,9 +896,12 @@ void routing_model_create(size_t size_of_links, void *loopback)
   surfxml_add_callback(ETag_surfxml_AS_cb_list, &parse_E_AS_XML);
 
   surfxml_add_callback(STag_surfxml_cluster_cb_list,
-                       &routing_full_parse_Scluster);
+                       &routing_parse_Scluster);
 
-  surfxml_add_callback(STag_surfxml_config_cb_list, &parse_Sconfig);
+  surfxml_add_callback(STag_surfxml_config_cb_list,
+					   &routing_parse_Sconfig);
+  surfxml_add_callback(ETag_surfxml_config_cb_list,
+					   &routing_parse_Econfig);
 }
 
 /* ************************************************************************** */
@@ -2907,13 +2910,25 @@ static void generic_src_dst_check(routing_component_t rc, const char *src,
               rc->name, dst_as->name);
 }
 
-static void parse_Sconfig(void)
+static void routing_parse_Sconfig(void)
 {
   //TODO
   DEBUG0("WARNING tag config not yet implemented.");
+  DEBUG1("Configuration name = %s",A_surfxml_config_id);
+}
+
+static void routing_parse_Econfig(void)
+{
+  //TODO
+  xbt_dict_cursor_t cursor = NULL;
+  char *key;
+  char *elem;
+  xbt_dict_foreach(current_property_set, cursor, key, elem) {
+	  DEBUG2("property : %s = %s",key,elem);
+	}
 }
 
-static void routing_full_parse_Scluster(void)
+static void routing_parse_Scluster(void)
 {
   static int AX_ptr = 0;