X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/624775b55293ba4ba88f6821cbb97a503a580073..d9e664e60bd7fab62db0f1d838efd1d7bfd4d367:/src/surf/instr_routing.c diff --git a/src/surf/instr_routing.c b/src/surf/instr_routing.c index 8aa9377763..63b21007a9 100644 --- a/src/surf/instr_routing.c +++ b/src/surf/instr_routing.c @@ -5,7 +5,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "instr/instr_private.h" -#include "mc/mc.h" #ifdef HAVE_TRACING #include "surf/surf_private.h" @@ -117,9 +116,6 @@ static void linkContainers (container_t src, container_t dst, xbt_dict_t filter) //create the link static long long counter = 0; - if(MC_is_active()) - MC_ignore_data_bss(&counter, sizeof(counter)); - char key[INSTR_DEFAULT_STR_SIZE]; snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter++); new_pajeStartLink(SIMIX_get_clock(), father, link_type, src, "topology", key); @@ -268,7 +264,10 @@ static void instr_routing_parse_start_host (sg_platf_host_cbarg_t host) if (power == NULL){ power = PJ_type_variable_new ("power", NULL, new->type); } - new_pajeSetVariable (0, new, power, host->power_peak); + + double current_power_state; + xbt_dynar_get_cpy(host->power_peak, host->pstate, ¤t_power_state); + new_pajeSetVariable (0, new, power, current_power_state); } if (TRACE_uncategorized()){ type_t power_used = PJ_type_get_or_null ("power_used", new->type);