XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_routing, instr, "Tracing platform hierarchy");
-extern xbt_dict_t defined_types; /* from instr_interface.c */
-
static int platform_created = 0; /* indicate whether the platform file has been traced */
static xbt_dynar_t currentContainer = NULL; /* push and pop, used only in creation */
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()){
- XBT_DEBUG("Graph extracing disable by user.");
+ XBT_DEBUG("Graph extraction disabled by user.");
return;
}
XBT_DEBUG ("Graph extraction for routing_component = %s", rc->name);
}
{
- xbt_graph_t graph = xbt_graph_new_graph (0, NULL);
+ xbt_graph_t graph = xbt_graph_new_graph (0, NULL);
xbt_dict_t nodes = xbt_dict_new_homogeneous(NULL);
xbt_dict_t edges = xbt_dict_new_homogeneous(NULL);
xbt_edge_t edge = NULL;
xbt_dict_free (&edges);
xbt_graph_free_graph(graph,xbt_free, xbt_free, NULL);
}
-
}
/*
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);