-/* Copyright (c) 2010, 2012-2013. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
#include "instr/instr_private.h"
#ifdef HAVE_TRACING
#include "surf/surf_private.h"
-//FIXME:#include "surf/network_private.h"
#include "xbt/graph.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_routing, instr, "Tracing platform hierarchy");
}
xbt_dict_free (&nodes);
xbt_dict_free (&edges);
- xbt_graph_free_graph(graph,xbt_free, xbt_free, NULL);
+ xbt_graph_free_graph(graph, xbt_free_f, xbt_free_f, NULL);
}
}
if (TRACE_uncategorized()){
type_t bandwidth_used = PJ_type_get_or_null ("bandwidth_used", new->type);
if (bandwidth_used == NULL){
- bandwidth_used = PJ_type_variable_new ("bandwidth_used", "0.5 0.5 0.5", new->type);
+ PJ_type_variable_new ("bandwidth_used", "0.5 0.5 0.5", new->type);
}
}
}
if (TRACE_uncategorized()){
type_t power_used = PJ_type_get_or_null ("power_used", new->type);
if (power_used == NULL){
- power_used = PJ_type_variable_new ("power_used", "0.5 0.5 0.5", new->type);
+ PJ_type_variable_new ("power_used", "0.5 0.5 0.5", new->type);
}
}
{
xbt_dynar_free(¤tContainer);
currentContainer = NULL;
- xbt_dict_t filter = xbt_dict_new_homogeneous(xbt_free);
+ xbt_dict_t filter = xbt_dict_new_homogeneous(xbt_free_f);
XBT_DEBUG ("Starting graph extraction.");
recursiveGraphExtraction (surf_platf_get_root(routing_platf), PJ_container_get_root(), filter);
XBT_DEBUG ("Graph extraction finished.");