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
fix the last broken tests by sanitizing the way properties are handled during the...
[simgrid.git]
/
src
/
surf
/
workstation_ptask_L07.c
diff --git
a/src/surf/workstation_ptask_L07.c
b/src/surf/workstation_ptask_L07.c
index
726ecb5
..
087e1a7
100644
(file)
--- a/
src/surf/workstation_ptask_L07.c
+++ b/
src/surf/workstation_ptask_L07.c
@@
-654,7
+654,7
@@
static void* ptask_cpu_create_resource(const char *name, double power_scale,
return cpu;
}
return cpu;
}
-static void ptask_parse_cpu_init(s
urf_parsing_host_
arg_t host)
+static void ptask_parse_cpu_init(s
g_platf_host_cb
arg_t host)
{
ptask_cpu_create_resource(
host->V_host_id,
{
ptask_cpu_create_resource(
host->V_host_id,
@@
-663,8
+663,7
@@
static void ptask_parse_cpu_init(surf_parsing_host_arg_t host)
host->V_host_power_trace,
host->V_host_state_initial,
host->V_host_state_trace,
host->V_host_power_trace,
host->V_host_state_initial,
host->V_host_state_trace,
- current_property_set);
- current_property_set=NULL;
+ host->properties);
}
static void* ptask_link_create_resource(const char *name,
}
static void* ptask_link_create_resource(const char *name,
@@
-802,7
+801,7
@@
static void ptask_add_traces(void)
static void ptask_define_callbacks()
{
/* Adding callback functions */
static void ptask_define_callbacks()
{
/* Adding callback functions */
- s
urf_parse
_host_add_cb(ptask_parse_cpu_init);
+ s
g_platf
_host_add_cb(ptask_parse_cpu_init);
surfxml_add_callback(ETag_surfxml_link_cb_list, &ptask_parse_link_init);
surfxml_add_callback(ETag_surfxml_platform_cb_list, &ptask_add_traces);
}
surfxml_add_callback(ETag_surfxml_link_cb_list, &ptask_parse_link_init);
surfxml_add_callback(ETag_surfxml_platform_cb_list, &ptask_add_traces);
}