Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Optimize bprintf during cluster loop.
[simgrid.git] / src / surf / surf_routing.c
index 8794bbc..e349129 100644 (file)
@@ -4,9 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifdef HAVE_PCRE_LIB
 #include <pcre.h>               /* regular expression library */
-#endif
 #include "surf_routing_private.h"
 #include "surf/surf_routing.h"
 
@@ -65,9 +63,7 @@ typedef enum {
   SURF_MODEL_DIJKSTRA,
   SURF_MODEL_DIJKSTRACACHE,
   SURF_MODEL_NONE,
-#ifdef HAVE_PCRE_LIB
   SURF_MODEL_RULEBASED
-#endif
 } e_routing_types;
 
 struct s_model_type routing_models[] = { {"Full",
@@ -90,12 +86,10 @@ struct s_model_type routing_models[] = { {"Full",
  model_dijkstra_both_unload, model_dijkstra_both_end},
 {"none", "No routing (usable with Constant network only)",
  model_none_create, model_none_load, model_none_unload, model_none_end},
-#ifdef HAVE_PCRE_LIB
 {"RuleBased", "Rule-Based routing data (...)", model_rulebased_create,
  model_rulebased_load, model_rulebased_unload, model_rulebased_end},
 {"Vivaldi", "Vivaldi routing", model_rulebased_create,
   model_rulebased_load, model_rulebased_unload, model_rulebased_end},
-#endif
 {NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
@@ -824,6 +818,7 @@ static xbt_dynar_t get_route_or_null(const char *src, const char *dst)
   TRY {
     get_route_latency(src, dst, &route, NULL, 1);
   }CATCH(exception) {
+    xbt_ex_free(exception);
     return NULL;
   }
   return route;
@@ -1516,21 +1511,16 @@ void routing_parse_Scluster(void)
   char *cluster_prefix = A_surfxml_cluster_prefix;
   char *cluster_suffix = A_surfxml_cluster_suffix;
   char *cluster_radical = A_surfxml_cluster_radical;
-  char *cluster_power = A_surfxml_cluster_power;
   char *cluster_core = A_surfxml_cluster_core;
-  char *cluster_bw = A_surfxml_cluster_bw;
-  char *cluster_lat = A_surfxml_cluster_lat;
-  char *temp_cluster_bw = NULL;
-  char *temp_cluster_lat = NULL;
-  char *temp_cluster_power = NULL;
   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 *cluster_power = xbt_strdup(A_surfxml_cluster_power);
+  char *cluster_bw = xbt_strdup(A_surfxml_cluster_bw);
+  char *cluster_lat = xbt_strdup(A_surfxml_cluster_lat);
   char *host_id, *groups, *link_id = NULL;
   char *router_id = xbt_strdup(A_surfxml_cluster_router_id);
-  char *availability_file = xbt_strdup(cluster_availability_file);
-  char *state_file = xbt_strdup(cluster_state_file);
+  char *availability_file = xbt_strdup(A_surfxml_cluster_availability_file);
+  char *state_file = xbt_strdup(A_surfxml_cluster_state_file);
 
   if(xbt_dict_size(patterns)==0)
          patterns = xbt_dict_new();
@@ -1539,9 +1529,11 @@ void routing_parse_Scluster(void)
   xbt_dict_set(patterns,"prefix",cluster_prefix,NULL);
   xbt_dict_set(patterns,"suffix",cluster_suffix,NULL);
 
-#ifdef HAVE_PCRE_LIB
+  cluster_power = replace_random_parameter(cluster_power);
+  cluster_bw = replace_random_parameter(cluster_bw);
+  cluster_lat = replace_random_parameter(cluster_lat);
+
   char *route_src_dst;
-#endif
   unsigned int iter;
   int start, end, i;
   xbt_dynar_t radical_elements;
@@ -1549,12 +1541,6 @@ void routing_parse_Scluster(void)
   int cluster_sharing_policy = AX_surfxml_cluster_sharing_policy;
   int cluster_bb_sharing_policy = AX_surfxml_cluster_bb_sharing_policy;
 
-#ifndef HAVE_PCRE_LIB
-  xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), NULL);
-  char *route_src, *route_dst;
-  int j;
-#endif
-
   static unsigned int surfxml_buffer_stack_stack_ptr = 1;
   static unsigned int surfxml_buffer_stack_stack[1024];
 
@@ -1563,13 +1549,8 @@ void routing_parse_Scluster(void)
   surfxml_bufferstack_push(1);
 
   SURFXML_BUFFER_SET(AS_id, cluster_id);
-#ifdef HAVE_PCRE_LIB
   SURFXML_BUFFER_SET(AS_routing, "RuleBased");
   XBT_DEBUG("<AS id=\"%s\"\trouting=\"RuleBased\">", cluster_id);
-#else
-  SURFXML_BUFFER_SET(AS_routing, "Full");
-  XBT_DEBUG("<AS id=\"%s\"\trouting=\"Full\">", cluster_id);
-#endif
   SURFXML_START_TAG(AS);
 
   radical_elements = xbt_str_split(cluster_radical, ",");
@@ -1577,60 +1558,66 @@ void routing_parse_Scluster(void)
     radical_ends = xbt_str_split(groups, "-");
     switch (xbt_dynar_length(radical_ends)) {
     case 1:
-      surf_parse_get_int(&start,
-                         xbt_dynar_get_as(radical_ends, 0, char *));
+      surf_parse_get_int(&start, xbt_dynar_get_as(radical_ends, 0, char *));
       host_id = bprintf("%s%d%s", cluster_prefix, start, cluster_suffix);
-#ifndef HAVE_PCRE_LIB
-      xbt_dynar_push_as(tab_elements_num, int, start);
-#endif
       link_id = bprintf("%s_link_%d", cluster_id, start);
-
       xbt_dict_set(patterns, "radical", bprintf("%d", start), xbt_free);
-      temp_cluster_power = xbt_strdup(cluster_power);
-      temp_cluster_power = replace_random_parameter(temp_cluster_power);
-      XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\">", host_id, temp_cluster_power);
       A_surfxml_host_state = A_surfxml_host_state_ON;
+
+      XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\">", host_id, cluster_power);
       SURFXML_BUFFER_SET(host_id, host_id);
-      SURFXML_BUFFER_SET(host_power, temp_cluster_power);
+      SURFXML_BUFFER_SET(host_power, cluster_power);
+
+      if(!strcmp(A_surfxml_cluster_availability_file,"")){
+                 char* tmp_availability_file = xbt_strdup(availability_file);
+                 xbt_str_varsubst(tmp_availability_file,patterns);
+                 XBT_DEBUG("\tavailability_file=\"%s\"",tmp_availability_file);
+             SURFXML_BUFFER_SET(host_availability_file, tmp_availability_file);
+             xbt_free(tmp_availability_file);
+      }
+      else
+      {
+                 XBT_DEBUG("\tavailability_file=\"\"");
+                 SURFXML_BUFFER_SET(host_availability_file, "");
+      }
+      if(!strcmp(A_surfxml_cluster_state_file,"")){
+                 char *tmp_state_file = xbt_strdup(state_file);
+                 xbt_str_varsubst(tmp_state_file,patterns);
+                 XBT_DEBUG("\tstate_file=\"%s\"",tmp_state_file);
+             SURFXML_BUFFER_SET(host_state_file, tmp_state_file);
+             xbt_free(tmp_state_file);
+      }
+      else
+      {
+         XBT_DEBUG("\tstate_file=\"\"");
+         SURFXML_BUFFER_SET(host_state_file, "");
+      }
+
       SURFXML_BUFFER_SET(host_core, cluster_core);
       SURFXML_BUFFER_SET(host_availability, "1.0");
       SURFXML_BUFFER_SET(host_coordinates, "");
-      xbt_free(availability_file);
-      availability_file = xbt_strdup(cluster_availability_file);
-      xbt_free(state_file);
-      state_file = xbt_strdup(cluster_state_file);
-      XBT_DEBUG("\tavailability_file=\"%s\"",xbt_str_varsubst(availability_file,patterns));
-      XBT_DEBUG("\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));
-      XBT_DEBUG("</host>");
       SURFXML_START_TAG(host);
       SURFXML_END_TAG(host);
+      XBT_DEBUG("</host>");
 
-
-      temp_cluster_bw = xbt_strdup(cluster_bw);
-      temp_cluster_bw = replace_random_parameter(temp_cluster_bw);
-      temp_cluster_lat = xbt_strdup(cluster_lat);
-      temp_cluster_lat = replace_random_parameter(temp_cluster_lat);
-      XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id,temp_cluster_bw, cluster_lat);
       A_surfxml_link_state = A_surfxml_link_state_ON;
       A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
       if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
          {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FULLDUPLEX;}
       if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
          {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FATPIPE;}
+
+      XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id,cluster_bw, cluster_lat);
+
       SURFXML_BUFFER_SET(link_id, link_id);
-      SURFXML_BUFFER_SET(link_bandwidth, temp_cluster_bw);
-      SURFXML_BUFFER_SET(link_latency, temp_cluster_lat);
+      SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
+      SURFXML_BUFFER_SET(link_latency, cluster_lat);
       SURFXML_BUFFER_SET(link_bandwidth_file, "");
       SURFXML_BUFFER_SET(link_latency_file, "");
       SURFXML_BUFFER_SET(link_state_file, "");
       SURFXML_START_TAG(link);
       SURFXML_END_TAG(link);
 
-      xbt_free(temp_cluster_bw);
-      xbt_free(temp_cluster_lat);
-      xbt_free(temp_cluster_power);
       free(link_id);
       free(host_id);
       break;
@@ -1641,65 +1628,73 @@ void routing_parse_Scluster(void)
                          xbt_dynar_get_as(radical_ends, 0, char *));
       surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *));
       for (i = start; i <= end; i++) {
-        host_id = bprintf("%s%d%s", cluster_prefix, i, cluster_suffix);
-#ifndef HAVE_PCRE_LIB
-        xbt_dynar_push_as(tab_elements_num, int, i);
-#endif
-        link_id = bprintf("%s_link_%d", cluster_id, i);
-
-        xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free);
-        temp_cluster_power = xbt_strdup(cluster_power);
-        temp_cluster_power = replace_random_parameter(temp_cluster_power);
-        XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\">", host_id, temp_cluster_power);
-        A_surfxml_host_state = A_surfxml_host_state_ON;
-        SURFXML_BUFFER_SET(host_id, host_id);
-        SURFXML_BUFFER_SET(host_power, temp_cluster_power);
-        SURFXML_BUFFER_SET(host_core, cluster_core);
-        SURFXML_BUFFER_SET(host_availability, "1.0");
-        SURFXML_BUFFER_SET(host_coordinates, "");
-        xbt_free(availability_file);
-        availability_file = xbt_strdup(cluster_availability_file);
-        xbt_free(state_file);
-        state_file = xbt_strdup(cluster_state_file);
-        XBT_DEBUG("\tavailability_file=\"%s\"",xbt_str_varsubst(availability_file,patterns));
-        XBT_DEBUG("\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));
-        XBT_DEBUG("</host>");
-        SURFXML_START_TAG(host);
-        SURFXML_END_TAG(host);
-
-        xbt_free(temp_cluster_power);
-
-        temp_cluster_bw = xbt_strdup(cluster_bw);
-        temp_cluster_bw = replace_random_parameter(temp_cluster_bw);
-        temp_cluster_lat = xbt_strdup(cluster_lat);
-        temp_cluster_lat = replace_random_parameter(temp_cluster_lat);
-        XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id,temp_cluster_bw, cluster_lat);
-        A_surfxml_link_state = A_surfxml_link_state_ON;
-        A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
-        if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
-           {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FULLDUPLEX;}
-        if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
-           {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FATPIPE;}
-        SURFXML_BUFFER_SET(link_id, link_id);
-        SURFXML_BUFFER_SET(link_bandwidth, temp_cluster_bw);
-        SURFXML_BUFFER_SET(link_latency, temp_cluster_lat);
-        SURFXML_BUFFER_SET(link_bandwidth_file, "");
-        SURFXML_BUFFER_SET(link_latency_file, "");
-        SURFXML_BUFFER_SET(link_state_file, "");
-        SURFXML_START_TAG(link);
-        SURFXML_END_TAG(link);
-
-        xbt_free(temp_cluster_bw);
-        xbt_free(temp_cluster_lat);
-        free(link_id);
-        free(host_id);
+                 host_id = bprintf("%s%d%s", cluster_prefix, i, cluster_suffix);
+                 link_id = bprintf("%s_link_%d", cluster_id, i);
+                 xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free);
+                 A_surfxml_host_state = A_surfxml_host_state_ON;
+
+             XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\">", host_id, cluster_power);
+             SURFXML_BUFFER_SET(host_id, host_id);
+             SURFXML_BUFFER_SET(host_power, cluster_power);
+
+             if(!strcmp(A_surfxml_cluster_availability_file,"")){
+                         char* tmp_availability_file = xbt_strdup(availability_file);
+                         xbt_str_varsubst(tmp_availability_file,patterns);
+                         XBT_DEBUG("\tavailability_file=\"%s\"",tmp_availability_file);
+                     SURFXML_BUFFER_SET(host_availability_file, tmp_availability_file);
+                     xbt_free(tmp_availability_file);
+             }
+             else
+             {
+                         XBT_DEBUG("\tavailability_file=\"\"");
+                         SURFXML_BUFFER_SET(host_availability_file, "");
+             }
+             if(!strcmp(A_surfxml_cluster_state_file,"")){
+                         char *tmp_state_file = xbt_strdup(state_file);
+                         xbt_str_varsubst(tmp_state_file,patterns);
+                         XBT_DEBUG("\tstate_file=\"%s\"",tmp_state_file);
+                     SURFXML_BUFFER_SET(host_state_file, tmp_state_file);
+                     xbt_free(tmp_state_file);
+             }
+             else
+             {
+                 XBT_DEBUG("\tstate_file=\"\"");
+                 SURFXML_BUFFER_SET(host_state_file, "");
+             }
+
+             SURFXML_BUFFER_SET(host_core, cluster_core);
+             SURFXML_BUFFER_SET(host_availability, "1.0");
+             SURFXML_BUFFER_SET(host_coordinates, "");
+             SURFXML_START_TAG(host);
+             SURFXML_END_TAG(host);
+             XBT_DEBUG("</host>");
+
+                 A_surfxml_link_state = A_surfxml_link_state_ON;
+                 A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+                 if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+                 {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FULLDUPLEX;}
+                 if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
+                 {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FATPIPE;}
+
+                 XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id,cluster_bw, cluster_lat);
+
+                 SURFXML_BUFFER_SET(link_id, link_id);
+                 SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
+                 SURFXML_BUFFER_SET(link_latency, cluster_lat);
+                 SURFXML_BUFFER_SET(link_bandwidth_file, "");
+                 SURFXML_BUFFER_SET(link_latency_file, "");
+                 SURFXML_BUFFER_SET(link_state_file, "");
+                 SURFXML_START_TAG(link);
+                 SURFXML_END_TAG(link);
+
+                 free(link_id);
+                 free(host_id);
       }
       break;
 
     default:
       XBT_DEBUG("Malformed radical");
+      break;
     }
 
     xbt_dynar_free(&radical_ends);
@@ -1736,7 +1731,6 @@ void routing_parse_Scluster(void)
 
   XBT_DEBUG(" ");
 
-#ifdef HAVE_PCRE_LIB
   char *new_suffix = xbt_strdup("");
 
   radical_elements = xbt_str_split(cluster_suffix, ".");
@@ -1749,7 +1743,7 @@ void routing_parse_Scluster(void)
   }
   route_src_dst = bprintf("%s(.*)%s", cluster_prefix, new_suffix);
   xbt_dynar_free(&radical_elements);
-  free(new_suffix);
+  xbt_free(new_suffix);
 
   char *pcre_link_src = bprintf("%s_link_$1src", cluster_id);
   char *pcre_link_backbone = bprintf("%s_backbone", cluster_id);
@@ -1868,82 +1862,14 @@ void routing_parse_Scluster(void)
   free(pcre_link_src);
   free(route_src_dst);
 
-#else
-  for (i = 0; i <= xbt_dynar_length(tab_elements_num); i++) {
-    for (j = 0; j <= xbt_dynar_length(tab_elements_num); j++) {
-      if (i == xbt_dynar_length(tab_elements_num)) {
-        route_src = router_id;
-      } else {
-        route_src =
-            bprintf("%s%d%s", cluster_prefix,
-                    xbt_dynar_get_as(tab_elements_num, i, int),
-                    cluster_suffix);
-      }
-
-      if (j == xbt_dynar_length(tab_elements_num)) {
-        route_dst = router_id;
-      } else {
-        route_dst =
-            bprintf("%s%d%s", cluster_prefix,
-                    xbt_dynar_get_as(tab_elements_num, j, int),
-                    cluster_suffix);
-      }
-
-      XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src, route_dst);
-      XBT_DEBUG("symmetrical=\"NO\">");
-      SURFXML_BUFFER_SET(route_src, route_src);
-      SURFXML_BUFFER_SET(route_dst, route_dst);
-      A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
-      SURFXML_START_TAG(route);
-
-      if (i != xbt_dynar_length(tab_elements_num)){
-          route_src =
-                bprintf("%s_link_%d", cluster_id,
-                        xbt_dynar_get_as(tab_elements_num, i, int));
-                 XBT_DEBUG("<link_ctn\tid=\"%s\"/>", route_src);
-                 SURFXML_BUFFER_SET(link_ctn_id, route_src);
-                 A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
-                 if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
-                 {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
-                 SURFXML_START_TAG(link_ctn);
-                 SURFXML_END_TAG(link_ctn);
-                 free(route_src);
-      }
-
-      if(strcmp(cluster_bb_bw,"") && strcmp(cluster_bb_lat,"")){
-      XBT_DEBUG("<link_ctn\tid=\"%s_backbone\"/>", cluster_id);
-      SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_backbone", cluster_id));
-      A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
-      SURFXML_START_TAG(link_ctn);
-      SURFXML_END_TAG(link_ctn);
-      }
-
-      if (j != xbt_dynar_length(tab_elements_num)) {
-          route_dst =
-                bprintf("%s_link_%d", cluster_id,
-                        xbt_dynar_get_as(tab_elements_num, j, int));
-                 XBT_DEBUG("<link_ctn\tid=\"%s\"/>", route_dst);
-                 SURFXML_BUFFER_SET(link_ctn_id, route_dst);
-                 A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
-                 if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
-                 {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;}
-                 SURFXML_START_TAG(link_ctn);
-                 SURFXML_END_TAG(link_ctn);
-                 free(route_dst);
-      }
-
-      XBT_DEBUG("</route>");
-      SURFXML_END_TAG(route);
-    }
-  }
-  xbt_dynar_free(&tab_elements_num);
-
-#endif
+  xbt_free(cluster_bw);
+  xbt_free(cluster_lat);
+  xbt_free(cluster_power);
+  xbt_free(availability_file);
+  xbt_free(state_file);
 
-  free(router_id);
+  xbt_free(router_id);
   xbt_dict_free(&patterns);
-  free(availability_file);
-  free(state_file);
 
   XBT_DEBUG("</AS>");
   SURFXML_END_TAG(AS);
@@ -2028,6 +1954,7 @@ static void routing_parse_Speer(void)
   SURFXML_BUFFER_SET(host_availability_file, peer_availability_file);
   SURFXML_BUFFER_SET(host_state_file, peer_state_file);
   SURFXML_BUFFER_SET(host_coordinates, "");
+  SURFXML_BUFFER_SET(host_core, "1.0");
   SURFXML_START_TAG(host);
   SURFXML_END_TAG(host);
 
@@ -2204,6 +2131,7 @@ static void routing_parse_Srandom(void)
                                          break;
                        default:
                                XBT_INFO("Malformed radical");
+                               break;
                        }
                        res = random_generate(random);
                        rd_name  = bprintf("%s_router",random_id);