X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6badbbf58554a35b03f58509b0b18cf606c38f5e..965a836d38ed45cf03c17e93aa97bc9aaf2917c9:/src/surf/surfxml_parse.c?ds=sidebyside diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 13002dea87..5cc4655c25 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -13,10 +13,10 @@ #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 +443,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 +455,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,7 +1061,7 @@ int_f_void_t surf_parse = _surf_parse; * With XML parser */ -double get_cpu_speed(const char *str_speed) +double parse_cpu_speed(const char *str_speed) { double speed = 0.0; const char *p, *q;