X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/de373585c6f108e58fa9ff51e5c494acb2445cb9..5423275bf80828ba9e68147dc76a6fcc737826a7:/src/surf/surf_routing.c

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 3f4c7fb136..6d6bec9f95 100644
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -207,7 +207,7 @@ static double vivaldi_get_link_latency (routing_component_t rc,
 /**
  * \brief Add a "host" to the network element list
  */
-static void parse_S_host(char *host_id, char* coord)
+static void parse_S_host(const char *host_id, const char* coord)
 {
   network_element_info_t info = NULL;
   if (current_routing->hierarchy == SURF_ROUTING_NULL)
@@ -224,7 +224,7 @@ static void parse_S_host(char *host_id, char* coord)
   info->rc_component = current_routing;
   info->rc_type = SURF_NETWORK_ELEMENT_HOST;
   xbt_dict_set(global_routing->where_network_elements, host_id,
-               (void *) info, NULL);
+               (void *) info, xbt_free);
 
   if (strcmp(coord,"")) {
   	xbt_dynar_t ctn = xbt_str_split_str(coord, " ");
@@ -233,6 +233,17 @@ static void parse_S_host(char *host_id, char* coord)
   }
 }
 
+static void parse_E_host(void)
+{
+	 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);
+		}
+}
+
 /*
  * \brief Add a host to the network element list from XML
  */
@@ -240,11 +251,15 @@ static void parse_S_host_XML(void)
 {
 	parse_S_host(A_surfxml_host_id, A_surfxml_host_coordinates);
 }
+static void parse_E_host_XML(void)
+{
+	parse_E_host();
+}
 
 /*
  * \brief Add a host to the network element list from lua script
  */
-static void parse_S_host_lua(char *host_id, char *coord)
+static void parse_S_host_lua(const char *host_id, const char *coord)
 {
   parse_S_host(host_id, coord);
 }
@@ -273,10 +288,7 @@ static void parse_S_router(void)
   info->rc_component = current_routing;
   info->rc_type = SURF_NETWORK_ELEMENT_ROUTER;
   xbt_dict_set(global_routing->where_network_elements, A_surfxml_router_id,
-               (void *) info, NULL);
-#ifdef HAVE_TRACING
-  TRACE_surf_host_declaration(A_surfxml_router_id, 0);
-#endif
+               (void *) info, xbt_free);
   if (strcmp(A_surfxml_router_coordinates,"")) {
     	xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_router_coordinates, " ");
     	xbt_dynar_shrink(ctn,0);
@@ -359,7 +371,7 @@ static void parse_S_bypassRoute_new_and_endpoints(void)
 /**
  * \brief Set a new link on the actual list of link for a route or ASroute
  */
-static void parse_E_link_ctn_new_elem(char *link_id)
+static void parse_E_link_ctn_new_elem(const char *link_id)
 {
   char *val;
   val = xbt_strdup(link_id);
@@ -389,7 +401,7 @@ static void parse_E_link_ctn_new_elem_XML(void)
 /**
  * \brief Set a new link on the actual list of link for a route or ASroute from lua
  */
-static void parse_E_link_c_ctn_new_elem_lua(char *link_id)
+static void parse_E_link_c_ctn_new_elem_lua(const char *link_id)
 {
   parse_E_link_ctn_new_elem(link_id);
 }
@@ -545,7 +557,7 @@ static void parse_S_AS_lua(char *id, char *mode)
  * When you finish to read the routing component, other structures must be created. 
  * the "end" method allow to do that for any routing model type
  */
-static void parse_E_AS(char *AS_id)
+static void parse_E_AS(const char *AS_id)
 {
 
   if (current_routing == NULL) {
@@ -560,7 +572,7 @@ static void parse_E_AS(char *AS_id)
     info->rc_component = current_routing->routing_father;
     info->rc_type = SURF_NETWORK_ELEMENT_AS;
     xbt_dict_set(global_routing->where_network_elements,
-                 current_routing->name, info, NULL);
+                 current_routing->name, info, xbt_free);
     (*(current_routing->routing->unload)) ();
     (*(current_routing->routing->end)) ();
     current_routing = current_routing->routing_father;
@@ -580,7 +592,7 @@ static void parse_E_AS_XML(void)
 /*
  * \brief Finish the creation of a new routing component from lua
  */
-static void parse_E_AS_lua(char *id)
+static void parse_E_AS_lua(const char *id)
 {
   parse_E_AS(id);
 }
@@ -749,7 +761,7 @@ static route_extended_t _get_route(const char *src, const char *dst)
                 "bad gateway for route between \"%s\" and \"%s\"", src,
                 dst);
 
-    if (src != e_route_cnt->src_gateway) {
+    if (strcmp(src, e_route_cnt->src_gateway)) {
       e_route_src = _get_route(src, e_route_cnt->src_gateway);
       xbt_assert2(e_route_src, "no route between \"%s\" and \"%s\"", src,
                   e_route_cnt->src_gateway);
@@ -762,7 +774,7 @@ static route_extended_t _get_route(const char *src, const char *dst)
       xbt_dynar_push(e_route->generic_route.link_list, &link);
     }
 
-    if (e_route_cnt->dst_gateway != dst) {
+    if (strcmp(e_route_cnt->dst_gateway, dst)) {
       e_route_dst = _get_route(e_route_cnt->dst_gateway, dst);
       xbt_assert2(e_route_dst, "no route between \"%s\" and \"%s\"",
                   e_route_cnt->dst_gateway, dst);
@@ -792,7 +804,7 @@ static double _get_latency(const char *src, const char *dst)
 
   xbt_assert0(src && dst, "bad parameters for \"_get_route\" method");
 
-  route_extended_t e_route, e_route_cnt;
+  route_extended_t e_route_cnt;
 
   xbt_dynar_t elem_father_list = elements_father(src, dst);
 
@@ -803,12 +815,6 @@ static double _get_latency(const char *src, const char *dst)
   routing_component_t dst_father =
       xbt_dynar_get_as(elem_father_list, 2, routing_component_t);
 
-  e_route = xbt_new0(s_route_extended_t, 1);
-  e_route->src_gateway = NULL;
-  e_route->dst_gateway = NULL;
-  e_route->generic_route.link_list =
-      xbt_dynar_new(global_routing->size_of_link, NULL);
-
   if (src_father == dst_father) {       /* SURF_ROUTING_BASE */
 
     if (strcmp(src, dst)) {
@@ -881,14 +887,19 @@ static xbt_dynar_t get_route(const char *src, const char *dst)
 {
 
   route_extended_t e_route;
-  xbt_dynar_t elem_father_list = elements_father(src, dst);
-  routing_component_t common_father =
-      xbt_dynar_get_as(elem_father_list, 0, routing_component_t);
+  xbt_dynar_t elem_father_list = NULL;
+  routing_component_t common_father = NULL;
 
   if (strcmp(src, dst))
     e_route = _get_route(src, dst);
-  else
+  else {
+    elem_father_list = elements_father(src, dst);
+    common_father =
+        xbt_dynar_get_as(elem_father_list, 0, routing_component_t);
+
     e_route = (*(common_father->get_route)) (common_father, src, dst);
+    xbt_dynar_free(&elem_father_list);
+  }
 
   xbt_assert2(e_route, "no route between \"%s\" and \"%s\"", src, dst);
 
@@ -902,7 +913,6 @@ static xbt_dynar_t get_route(const char *src, const char *dst)
     xbt_free(e_route->dst_gateway);
 
   xbt_free(e_route);
-  xbt_dynar_free(&elem_father_list);
 
 /*
   if (xbt_dynar_length(global_routing->last_route) == 0)
@@ -944,6 +954,7 @@ static double get_latency(const char *src, const char *dst)
     latency = (*(common_father->get_latency)) (common_father, src, dst);
 
   xbt_assert2(latency>=0.0, "no route between \"%s\" and \"%s\"", src, dst);
+  xbt_dynar_free(&elem_father_list);
 
   return latency;
 }
@@ -1064,6 +1075,7 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_
 
   /* parse generic elements */
   surfxml_add_callback(STag_surfxml_host_cb_list, &parse_S_host_XML);
+  surfxml_add_callback(ETag_surfxml_host_cb_list, &parse_E_host_XML);
   surfxml_add_callback(STag_surfxml_router_cb_list, &parse_S_router);
 
   surfxml_add_callback(STag_surfxml_route_cb_list,
@@ -1096,6 +1108,10 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_
 					   &routing_parse_Sconfig);
   surfxml_add_callback(ETag_surfxml_config_cb_list,
 					   &routing_parse_Econfig);
+
+#ifdef HAVE_TRACING
+  instr_routing_define_callbacks();
+#endif
 }
 
 /* ************************************************************************** */
@@ -1313,7 +1329,7 @@ static void model_full_set_route(routing_component_t rc, const char *src,
 			  (void*)link_route_to_test,
 			  (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
 			  "The route between \"%s\" and \"%s\" already exists", src,dst);
-		xbt_free(link_route_to_test);
+		xbt_dynar_free(&link_route_to_test);
 	}
 	else
 	{
@@ -1353,7 +1369,7 @@ static void model_full_set_route(routing_component_t rc, const char *src,
 			      (void*)link_route_to_test,
 				  (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
 				  "The route between \"%s\" and \"%s\" already exists", src,dst);
-			xbt_free(link_route_to_test);
+			xbt_dynar_free(&link_route_to_test);
 		}
 		else
 		{
@@ -2872,6 +2888,7 @@ static double generic_get_link_latency(routing_component_t rc,
 	xbt_dynar_foreach(route->generic_route.link_list,i,link) {
 		latency += get_link_latency(link);
 	}
+	generic_free_extended_route(route);
   return latency;
 }
 
@@ -3246,8 +3263,19 @@ static void routing_parse_Scluster(void)
   char *cluster_lat = A_surfxml_cluster_lat;
   char *cluster_bb_bw = A_surfxml_cluster_bb_bw;
   char *cluster_bb_lat = A_surfxml_cluster_bb_lat;
+  char *cluster_availability_file = A_surfxml_cluster_availability_file;
+  char *cluster_state_file = A_surfxml_cluster_state_file;
   char *host_id, *groups, *link_id = NULL;
   char *router_id, *link_router, *link_backbone;
+  char *availability_file = bprintf("%s",cluster_availability_file);
+  char *state_file = bprintf("%s",cluster_state_file);
+
+  xbt_dict_t patterns = xbt_dict_new();
+  xbt_dict_set(patterns,"id",cluster_id,NULL);
+  xbt_dict_set(patterns,"prefix",cluster_prefix,NULL);
+  xbt_dict_set(patterns,"suffix",cluster_suffix,NULL);
+
+
 #ifdef HAVE_PCRE_LIB
   char *route_src_dst;
 #endif
@@ -3294,14 +3322,20 @@ static void routing_parse_Scluster(void)
 #endif
       link_id = bprintf("%s_link_%d", cluster_id, start);
 
-      DEBUG2("<host\tid=\"%s\"\tpower=\"%s\"/>", host_id, cluster_power);
+      DEBUG2("<host\tid=\"%s\"\tpower=\"%s\">", host_id, cluster_power);
       A_surfxml_host_state = A_surfxml_host_state_ON;
       SURFXML_BUFFER_SET(host_id, host_id);
       SURFXML_BUFFER_SET(host_power, cluster_power);
       SURFXML_BUFFER_SET(host_core, cluster_core);
       SURFXML_BUFFER_SET(host_availability, "1.0");
-      SURFXML_BUFFER_SET(host_availability_file, "");
-      SURFXML_BUFFER_SET(host_state_file, "");
+	  xbt_dict_set(patterns,"radical",bprintf("%d",start),NULL);
+	  availability_file = bprintf("%s",cluster_availability_file);
+	  state_file = bprintf("%s",cluster_state_file);
+	  DEBUG1("\tavailability_file=\"%s\"",xbt_str_varsubst(availability_file,patterns));
+	  DEBUG1("\tstate_file=\"%s\"",xbt_str_varsubst(state_file,patterns));
+	  SURFXML_BUFFER_SET(host_availability_file, xbt_str_varsubst(availability_file,patterns));
+	  SURFXML_BUFFER_SET(host_state_file, xbt_str_varsubst(state_file,patterns));
+	  DEBUG0("</host>");
       SURFXML_START_TAG(host);
       SURFXML_END_TAG(host);
 
@@ -3330,7 +3364,6 @@ static void routing_parse_Scluster(void)
       surf_parse_get_int(&start,
                          xbt_dynar_get_as(radical_ends, 0, char *));
       surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *));
-      DEBUG2("Create hosts and links from %d to %d", start, end);
       for (i = start; i <= end; i++) {
         host_id = bprintf("%s%d%s", cluster_prefix, i, cluster_suffix);
 #ifndef HAVE_PCRE_LIB
@@ -3338,14 +3371,20 @@ static void routing_parse_Scluster(void)
 #endif
         link_id = bprintf("%s_link_%d", cluster_id, i);
 
-        DEBUG2("<host\tid=\"%s\"\tpower=\"%s\"/>", host_id, cluster_power);
+        DEBUG2("<host\tid=\"%s\"\tpower=\"%s\"", host_id, cluster_power);
         A_surfxml_host_state = A_surfxml_host_state_ON;
         SURFXML_BUFFER_SET(host_id, host_id);
         SURFXML_BUFFER_SET(host_power, cluster_power);
         SURFXML_BUFFER_SET(host_core, cluster_core);
-        SURFXML_BUFFER_SET(host_availability, "1.0");
-        SURFXML_BUFFER_SET(host_availability_file, "");
-        SURFXML_BUFFER_SET(host_state_file, "");
+		SURFXML_BUFFER_SET(host_availability, "1.0");
+		xbt_dict_set(patterns,"radical",bprintf("%d",i),NULL);
+		availability_file = bprintf("%s",cluster_availability_file);
+		state_file = bprintf("%s",cluster_state_file);
+		DEBUG1("\tavailability_file=\"%s\"",xbt_str_varsubst(availability_file,patterns));
+		DEBUG1("\tstate_file=\"%s\"",xbt_str_varsubst(state_file,patterns));
+		SURFXML_BUFFER_SET(host_availability_file, xbt_str_varsubst(availability_file,patterns));
+		SURFXML_BUFFER_SET(host_state_file, xbt_str_varsubst(state_file,patterns));
+		DEBUG0("</host>");
         SURFXML_START_TAG(host);
         SURFXML_END_TAG(host);
 
@@ -3554,6 +3593,9 @@ static void routing_parse_Scluster(void)
 
   free(link_backbone);
   free(link_router);
+  xbt_dict_free(&patterns);
+  free(availability_file);
+  free(state_file);
 
   DEBUG0("</AS>");
   SURFXML_END_TAG(AS);
@@ -3572,6 +3614,8 @@ static void routing_parse_Speer(void)
   char *peer_bw_out = A_surfxml_peer_bw_out;
   char *peer_lat = A_surfxml_peer_lat;
   char *peer_coord = A_surfxml_peer_coordinates;
+  char *peer_state_file = A_surfxml_peer_state_file;
+  char *peer_availability_file = A_surfxml_peer_availability_file;
 
   char *host_id = NULL;
   char *router_id, *link_router, *link_backbone, *link_id_up, *link_id_down;
@@ -3619,8 +3663,8 @@ static void routing_parse_Speer(void)
   SURFXML_BUFFER_SET(host_id, host_id);
   SURFXML_BUFFER_SET(host_power, peer_power);
   SURFXML_BUFFER_SET(host_availability, "1.0");
-  SURFXML_BUFFER_SET(host_availability_file, "");
-  SURFXML_BUFFER_SET(host_state_file, "");
+  SURFXML_BUFFER_SET(host_availability_file, peer_availability_file);
+  SURFXML_BUFFER_SET(host_state_file, peer_state_file);
   SURFXML_START_TAG(host);
   SURFXML_END_TAG(host);