XBT_DEBUG (" linkContainers %s <-> %s", src->name, dst->name);
}
-static int graph_extraction_filter_out (container_t c1, container_t c2)
-{
- if (c1->kind == INSTR_LINK ||
- c1->kind == INSTR_SMPI ||
- c1->kind == INSTR_MSG_PROCESS ||
- c1->kind == INSTR_MSG_TASK ||
- (c2 && strcmp (c1->name, c2->name) == 0))
- return 1;
- else
- return 0;
-}
-
static void recursiveGraphExtraction (AS_t rc, container_t container, xbt_dict_t filter)
{
if (!TRACE_platform_topology()){
container_t new = PJ_container_new (link_name, INSTR_LINK, father);
- if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()){
+ if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_link())) {
type_t bandwidth = PJ_type_get_or_null ("bandwidth", new->type);
if (bandwidth == NULL){
bandwidth = PJ_type_variable_new ("bandwidth", NULL, new->type);
container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
container_t new = PJ_container_new (host->id, INSTR_HOST, father);
- if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
+ if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_power())) {
type_t power = PJ_type_get_or_null ("power", new->type);
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);