X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/70388188c97f56fbe2b645c9b00dcb05d0b86509..6e5cfd7ff86900354c20502af95ee5f751492753:/src/surf/workstation_ptask_L07.c diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index 726ecb5db7..4ed016cf79 100644 --- 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; } -static void ptask_parse_cpu_init(surf_parsing_host_arg_t host) +static void ptask_parse_cpu_init(sg_platf_host_cbarg_t host) { 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, - current_property_set); - current_property_set=NULL; + host->properties); } static void* ptask_link_create_resource(const char *name, @@ -802,9 +801,9 @@ static void ptask_add_traces(void) static void ptask_define_callbacks() { /* Adding callback functions */ - surf_parse_host_add_cb(ptask_parse_cpu_init); + sg_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); + sg_platf_postparse_add_cb(ptask_add_traces); } /**************************************/