A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Further untangle trace:connect. make trace_connect_list_host_avail private
[simgrid.git]
/
src
/
surf
/
surfxml_parse.c
diff --git
a/src/surf/surfxml_parse.c
b/src/surf/surfxml_parse.c
index
13002de
..
5cc4655
100644
(file)
--- 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 "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 "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");
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){
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 {
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);
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);
}
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
*/
* 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;
{
double speed = 0.0;
const char *p, *q;