kill platform generation from the C sources

[simgrid.git] / src / surf / surfxml_parse.c

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 13002de..596a5b9 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -13,10 +13,9 @@
 #include "xbt/str.h"
 #include "xbt/file.h"
 #include "xbt/dict.h"
-#include "surf/surfxml_parse.h"
 #include "src/surf/surf_private.h"
-#include "surf/random_mgr.h"
 #include "simgrid/sg_config.h"
+#include "surfxml_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
                                 "Logging specific to the SURF parsing module");
@@ -443,7 +442,7 @@ void ETag_surfxml_host(void)    {
   XBT_DEBUG("Buffer: %s", buf);
   host.speed_peak = xbt_dynar_new(sizeof(double), NULL);
   if (strchr(buf, ',') == NULL){
-         double speed = get_cpu_speed(A_surfxml_host_power);
+         double speed = parse_cpu_speed(A_surfxml_host_power);
          xbt_dynar_push_as(host.speed_peak,double, speed);
   }
   else {
@@ -455,7 +454,7 @@ void ETag_surfxml_host(void)    {
 
                  xbt_dynar_get_cpy(pstate_list, i, &speed_str);
                  xbt_str_trim(speed_str, NULL);
-                 speed = get_cpu_speed(speed_str);
+                 speed = parse_cpu_speed(speed_str);
                  xbt_dynar_push_as(host.speed_peak, double, speed);
                  XBT_DEBUG("Speed value: %f", speed);
          }
@@ -1061,33 +1060,11 @@ int_f_void_t surf_parse = _surf_parse;
  * With XML parser
  */
 
-double get_cpu_speed(const char *str_speed)
-{
-  double speed = 0.0;
-  const char *p, *q;
-  char *generator;
-  random_data_t random = NULL;
-  /* randomness is inserted like this: power="$rand(my_random)" */
-  if (((p = strstr(str_speed, "$rand(")) != NULL)
-      && ((q = strstr(str_speed, ")")) != NULL)) {
-    if (p < q) {
-      generator = xbt_malloc(q - (p + 6) + 1);
-      memcpy(generator, p + 6, q - (p + 6));
-      generator[q - (p + 6)] = '\0';
-      random = xbt_dict_get_or_null(random_data_list, generator);
-      xbt_assert(random, "Random generator %s undefined", generator);
-      speed = random_generate(random);
-    }
-  } else {
-    speed = surf_parse_get_speed(str_speed);
-  }
-  return speed;
+double parse_cpu_speed(const char *str_speed)
+{ // FIXME deadcode
+  return surf_parse_get_speed(str_speed);
 }
 
-double random_min, random_max, random_mean, random_std_deviation;
-e_random_generator_t random_generator;
-char *random_id;
-
 xbt_dict_t get_as_router_properties(const char* name)
 {
   return xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL);