X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/62b54dd272b6f669c0a9b231991d572c3bec52b5..af1adb0177f8402c6fe071f6043d64e009d2b439:/src/surf/instr_routing.cpp diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp index 05a47064c5..b424b7acfa 100644 --- a/src/surf/instr_routing.cpp +++ b/src/surf/instr_routing.cpp @@ -1,56 +1,58 @@ -/* Copyright (c) 2010, 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2010-2017. 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. */ #include "src/instr/instr_private.h" -#include "src/surf/surf_private.h" +#include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Host.hpp" +#include "src/kernel/routing/NetZoneImpl.hpp" +#include "src/surf/network_interface.hpp" +#include "src/surf/xml/platf_private.hpp" +#include "surf/surf.h" #include "xbt/graph.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_routing, instr, "Tracing platform hierarchy"); 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 */ +static std::vector currentContainer; /* push and pop, used only in creation */ static const char *instr_node_name (xbt_node_t node) { void *data = xbt_graph_node_get_data(node); - char *str = (char*)data; - return str; + return static_cast(data); } - static container_t lowestCommonAncestor (container_t a1, container_t a2) { //this is only an optimization (since most of a1 and a2 share the same parent) - if (a1->father == a2->father) return a1->father; + if (a1->father == a2->father) + return a1->father; //create an array with all ancestors of a1 - xbt_dynar_t ancestors_a1 = xbt_dynar_new(sizeof(container_t), NULL); - container_t p; - p = a1->father; + std::vector ancestors_a1; + container_t p = a1->father; while (p){ - xbt_dynar_push_as (ancestors_a1, container_t, p); + ancestors_a1.push_back(p); p = p->father; } //create an array with all ancestors of a2 - xbt_dynar_t ancestors_a2 = xbt_dynar_new(sizeof(container_t), NULL); + std::vector ancestors_a2; p = a2->father; while (p){ - xbt_dynar_push_as (ancestors_a2, container_t, p); + ancestors_a2.push_back(p); p = p->father; } //find the lowest ancestor - p = NULL; - int i = xbt_dynar_length (ancestors_a1) - 1; - int j = xbt_dynar_length (ancestors_a2) - 1; + p = nullptr; + int i = ancestors_a1.size() - 1; + int j = ancestors_a2.size() - 1; while (i >= 0 && j >= 0){ - container_t a1p = *(container_t*)xbt_dynar_get_ptr (ancestors_a1, i); - container_t a2p = *(container_t*)xbt_dynar_get_ptr (ancestors_a2, j); + container_t a1p = ancestors_a1.at(i); + container_t a2p = ancestors_a2.at(j); if (a1p == a2p){ p = a1p; }else{ @@ -59,8 +61,6 @@ static container_t lowestCommonAncestor (container_t a1, container_t a2) i--; j--; } - xbt_dynar_free (&ancestors_a1); - xbt_dynar_free (&ancestors_a2); return p; } @@ -74,13 +74,14 @@ static void linkContainers (container_t src, container_t dst, xbt_dict_t filter) //find common father container_t father = lowestCommonAncestor (src, dst); - if (!father){ + if (not father) { xbt_die ("common father unknown, this is a tracing problem"); } - if (filter != NULL){ + if (filter != nullptr){ //check if we already register this pair (we only need one direction) - char aux1[INSTR_DEFAULT_STR_SIZE], aux2[INSTR_DEFAULT_STR_SIZE]; + char aux1[INSTR_DEFAULT_STR_SIZE]; + char aux2[INSTR_DEFAULT_STR_SIZE]; snprintf (aux1, INSTR_DEFAULT_STR_SIZE, "%s%s", src->name, dst->name); snprintf (aux2, INSTR_DEFAULT_STR_SIZE, "%s%s", dst->name, src->name); if (xbt_dict_get_or_null (filter, aux1)){ @@ -93,8 +94,8 @@ static void linkContainers (container_t src, container_t dst, xbt_dict_t filter) } //ok, not found, register it - xbt_dict_set (filter, aux1, xbt_strdup ("1"), NULL); - xbt_dict_set (filter, aux2, xbt_strdup ("1"), NULL); + xbt_dict_set (filter, aux1, xbt_strdup ("1"), nullptr); + xbt_dict_set (filter, aux2, xbt_strdup ("1"), nullptr); } //declare type @@ -104,62 +105,58 @@ static void linkContainers (container_t src, container_t dst, xbt_dict_t filter) src->type->name, src->type->id, dst->type->name, dst->type->id); type_t link_type = PJ_type_get_or_null (link_typename, father->type); - if (link_type == NULL){ + if (link_type == nullptr){ link_type = PJ_type_link_new (link_typename, father->type, src->type, dst->type); } //register EDGE types for triva configuration - xbt_dict_set (trivaEdgeTypes, link_type->name, xbt_strdup("1"), NULL); + xbt_dict_set (trivaEdgeTypes, link_type->name, xbt_strdup("1"), nullptr); //create the link static long long counter = 0; 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); - new_pajeEndLink(SIMIX_get_clock(), father, link_type, dst, "topology", key); + snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter); + counter++; + + new StartLinkEvent(SIMIX_get_clock(), father, link_type, src, "topology", key); + new EndLinkEvent(SIMIX_get_clock(), father, link_type, dst, "topology", key); XBT_DEBUG (" linkContainers %s <-> %s", src->name, dst->name); } -static void recursiveGraphExtraction (AS_t rc, container_t container, xbt_dict_t filter) +static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t container, xbt_dict_t filter) { - if (!TRACE_platform_topology()){ + if (not TRACE_platform_topology()) { XBT_DEBUG("Graph extraction disabled by user."); return; } - XBT_DEBUG ("Graph extraction for routing_component = %s", surf_AS_get_name(rc)); - if (!xbt_dict_is_empty(surf_AS_get_routing_sons(rc))){ - xbt_dict_cursor_t cursor = NULL; - AS_t rc_son; - char *child_name; + XBT_DEBUG("Graph extraction for NetZone = %s", netzone->name()); + if (not netzone->children()->empty()) { //bottom-up recursion - xbt_dict_foreach(surf_AS_get_routing_sons(rc), cursor, child_name, rc_son) { - container_t child_container = (container_t) xbt_dict_get ( - container->children, surf_AS_get_name(rc_son)); - recursiveGraphExtraction (rc_son, child_container, filter); + for (auto nz_son : *netzone->children()) { + container_t child_container = static_cast(xbt_dict_get(container->children, nz_son->name())); + recursiveGraphExtraction(nz_son, child_container, filter); } } - { - 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_graph_t graph = xbt_graph_new_graph (0, nullptr); + xbt_dict_t nodes = xbt_dict_new_homogeneous(nullptr); + xbt_dict_t edges = xbt_dict_new_homogeneous(nullptr); + xbt_edge_t edge = nullptr; - xbt_dict_cursor_t cursor = NULL; - char *edge_name; + xbt_dict_cursor_t cursor = nullptr; + char *edge_name; - surf_AS_get_graph(rc, graph, nodes, edges); - xbt_dict_foreach(edges,cursor,edge_name,edge) { - linkContainers( - PJ_container_get((const char*) edge->src->data), - PJ_container_get((const char*) edge->dst->data), filter); - } - xbt_dict_free (&nodes); - xbt_dict_free (&edges); - xbt_graph_free_graph(graph, xbt_free_f, xbt_free_f, NULL); + static_cast(netzone)->getGraph(graph, nodes, edges); + xbt_dict_foreach(edges,cursor,edge_name,edge) { + linkContainers( + PJ_container_get(static_cast(edge->src->data)), + PJ_container_get(static_cast(edge->dst->data)), filter); } + xbt_dict_free (&nodes); + xbt_dict_free (&edges); + xbt_graph_free_graph(graph, xbt_free_f, xbt_free_f, nullptr); } /* @@ -169,126 +166,105 @@ void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS) { const char*id = AS->id; - if (PJ_container_get_root() == NULL){ + if (PJ_container_get_root() == nullptr){ PJ_container_alloc (); PJ_type_alloc(); - container_t root = PJ_container_new (id, INSTR_AS, NULL); + container_t root = PJ_container_new (id, INSTR_AS, nullptr); PJ_container_set_root (root); if (TRACE_smpi_is_enabled()) { - if (!TRACE_smpi_is_grouped()){ - type_t mpi = PJ_type_get_or_null ("MPI", root->type); - if (mpi == NULL){ - mpi = PJ_type_container_new("MPI", root->type); + type_t mpi = PJ_type_get_or_null ("MPI", root->type); + if (mpi == nullptr){ + mpi = PJ_type_container_new("MPI", root->type); + if (not TRACE_smpi_is_grouped()) PJ_type_state_new ("MPI_STATE", mpi); - PJ_type_link_new ("MPI_LINK", PJ_type_get_root(), mpi, mpi); - } + PJ_type_link_new ("MPI_LINK", PJ_type_get_root(), mpi, mpi); } } if (TRACE_needs_platform()){ - currentContainer = xbt_dynar_new (sizeof(container_t), NULL); - xbt_dynar_push (currentContainer, &root); + currentContainer.push_back(root); } return; } if (TRACE_needs_platform()){ - container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); + container_t father = currentContainer.back(); container_t container = PJ_container_new (id, INSTR_AS, father); - xbt_dynar_push (currentContainer, &container); + currentContainer.push_back(container); } } void sg_instr_AS_end() { if (TRACE_needs_platform()){ - xbt_dynar_pop_ptr (currentContainer); + currentContainer.pop_back(); } } -static void instr_routing_parse_start_link (sg_platf_link_cbarg_t link) +static void instr_routing_parse_start_link(simgrid::s4u::Link& link) { - container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); - - double bandwidth_value = link->bandwidth; - double latency_value = link->latency; - xbt_dynar_t links_to_create = xbt_dynar_new (sizeof(char*), &xbt_free_ref); - - if (link->policy == SURF_LINK_FULLDUPLEX){ - char *up = bprintf("%s_UP", link->id); - char *down = bprintf("%s_DOWN", link->id); - xbt_dynar_push_as (links_to_create, char*, xbt_strdup(up)); - xbt_dynar_push_as (links_to_create, char*, xbt_strdup(down)); - free (up); - free (down); - }else{ - xbt_dynar_push_as (links_to_create, char*, strdup(link->id)); - } + if (currentContainer.empty()) // No ongoing parsing. Are you creating the loopback? + return; + container_t father = currentContainer.back(); - char *link_name = NULL; - unsigned int i; - xbt_dynar_foreach (links_to_create, i, link_name){ + double bandwidth_value = link.bandwidth(); + double latency_value = link.latency(); - container_t container = PJ_container_new (link_name, INSTR_LINK, father); + container_t container = PJ_container_new(link.name(), INSTR_LINK, father); - if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_link())) { - type_t bandwidth = PJ_type_get_or_null ("bandwidth", container->type); - if (bandwidth == NULL){ - bandwidth = PJ_type_variable_new ("bandwidth", NULL, container->type); - } - type_t latency = PJ_type_get_or_null ("latency", container->type); - if (latency == NULL){ - latency = PJ_type_variable_new ("latency", NULL, container->type); - } - new_pajeSetVariable (0, container, bandwidth, bandwidth_value); - new_pajeSetVariable (0, container, latency, latency_value); + if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_link())) { + type_t bandwidth = PJ_type_get_or_null("bandwidth", container->type); + if (bandwidth == nullptr) { + bandwidth = PJ_type_variable_new("bandwidth", nullptr, container->type); } - if (TRACE_uncategorized()){ - type_t bandwidth_used = PJ_type_get_or_null ("bandwidth_used", container->type); - if (bandwidth_used == NULL){ - PJ_type_variable_new ("bandwidth_used", "0.5 0.5 0.5", container->type); - } + type_t latency = PJ_type_get_or_null("latency", container->type); + if (latency == nullptr) { + latency = PJ_type_variable_new("latency", nullptr, container->type); + } + new SetVariableEvent(0, container, bandwidth, bandwidth_value); + new SetVariableEvent(0, container, latency, latency_value); + } + if (TRACE_uncategorized()) { + type_t bandwidth_used = PJ_type_get_or_null("bandwidth_used", container->type); + if (bandwidth_used == nullptr) { + PJ_type_variable_new("bandwidth_used", "0.5 0.5 0.5", container->type); } } - - xbt_dynar_free (&links_to_create); } -static void instr_routing_parse_start_host (sg_platf_host_cbarg_t host) +void sg_instr_new_host(simgrid::s4u::Host& host) { - container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); - container_t container = PJ_container_new (host->id, INSTR_HOST, father); + container_t father = currentContainer.back(); + container_t container = PJ_container_new(host.cname(), INSTR_HOST, father); - if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_power())) { - type_t power = PJ_type_get_or_null ("power", container->type); - if (power == NULL){ - power = PJ_type_variable_new ("power", NULL, container->type); + if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_speed())) { + type_t speed = PJ_type_get_or_null ("power", container->type); + if (speed == nullptr){ + speed = PJ_type_variable_new ("power", nullptr, container->type); } - double current_power_state; - xbt_dynar_get_cpy(host->power_peak, host->pstate, ¤t_power_state); - new_pajeSetVariable (0, container, power, current_power_state); + double current_speed_state = host.speed(); + new SetVariableEvent (0, container, speed, current_speed_state); } if (TRACE_uncategorized()){ - type_t power_used = PJ_type_get_or_null ("power_used", container->type); - if (power_used == NULL){ + type_t speed_used = PJ_type_get_or_null ("power_used", container->type); + if (speed_used == nullptr){ PJ_type_variable_new ("power_used", "0.5 0.5 0.5", container->type); } } if (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()){ type_t mpi = PJ_type_get_or_null ("MPI", container->type); - if (mpi == NULL){ + if (mpi == nullptr){ mpi = PJ_type_container_new("MPI", container->type); PJ_type_state_new ("MPI_STATE", mpi); - PJ_type_link_new ("MPI_LINK", PJ_type_get_root(), mpi, mpi); } } if (TRACE_msg_process_is_enabled()) { type_t msg_process = PJ_type_get_or_null ("MSG_PROCESS", container->type); - if (msg_process == NULL){ + if (msg_process == nullptr){ msg_process = PJ_type_container_new("MSG_PROCESS", container->type); type_t state = PJ_type_state_new ("MSG_PROCESS_STATE", msg_process); PJ_value_new ("suspend", "1 0 1", state); @@ -303,7 +279,7 @@ static void instr_routing_parse_start_host (sg_platf_host_cbarg_t host) if (TRACE_msg_vm_is_enabled()) { type_t msg_vm = PJ_type_get_or_null ("MSG_VM", container->type); - if (msg_vm == NULL){ + if (msg_vm == nullptr){ msg_vm = PJ_type_container_new("MSG_VM", container->type); type_t state = PJ_type_state_new ("MSG_VM_STATE", msg_vm); PJ_value_new ("suspend", "1 0 1", state); @@ -318,19 +294,20 @@ static void instr_routing_parse_start_host (sg_platf_host_cbarg_t host) } -void sg_instr_new_router(sg_platf_router_cbarg_t router) +void sg_instr_new_router(const char* name) { - container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); - PJ_container_new (router->id, INSTR_ROUTER, father); + if (TRACE_is_enabled() && TRACE_needs_platform()) { + container_t father = currentContainer.back(); + PJ_container_new(name, INSTR_ROUTER, father); + } } static void instr_routing_parse_end_platform () { - xbt_dynar_free(¤tContainer); - currentContainer = NULL; + currentContainer.clear(); 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); + recursiveGraphExtraction(simgrid::s4u::Engine::instance()->netRoot(), PJ_container_get_root(), filter); XBT_DEBUG ("Graph extraction finished."); xbt_dict_free(&filter); platform_created = 1; @@ -339,14 +316,13 @@ static void instr_routing_parse_end_platform () void instr_routing_define_callbacks () { - if (!TRACE_is_enabled()) return; //always need the call backs to ASes (we need only the root AS), //to create the rootContainer and the rootType properly - if (!TRACE_needs_platform()) return; - sg_platf_link_add_cb(instr_routing_parse_start_link); - sg_platf_host_add_cb(instr_routing_parse_start_host); - - sg_platf_postparse_add_cb(instr_routing_parse_end_platform); + if (not TRACE_is_enabled() || not TRACE_needs_platform()) + return; + simgrid::s4u::Link::onCreation.connect(instr_routing_parse_start_link); + simgrid::s4u::onPlatformCreated.connect(instr_routing_parse_end_platform); + simgrid::s4u::Host::onCreation.connect(sg_instr_new_host); } /* @@ -354,22 +330,22 @@ void instr_routing_define_callbacks () */ static void recursiveNewVariableType (const char *new_typename, const char *color, type_t root) { - if (!strcmp (root->name, "HOST")){ + if (not strcmp(root->name, "HOST")) { char tnstr[INSTR_DEFAULT_STR_SIZE]; snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "p%s", new_typename); PJ_type_variable_new (tnstr, color, root); } - if (!strcmp (root->name, "MSG_VM")){ + if (not strcmp(root->name, "MSG_VM")) { char tnstr[INSTR_DEFAULT_STR_SIZE]; snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "p%s", new_typename); PJ_type_variable_new (tnstr, color, root); } - if (!strcmp (root->name, "LINK")){ + if (not strcmp(root->name, "LINK")) { char tnstr[INSTR_DEFAULT_STR_SIZE]; snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "b%s", new_typename); PJ_type_variable_new (tnstr, color, root); } - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; type_t child_type; char *name; xbt_dict_foreach(root->children, cursor, name, child_type) { @@ -384,10 +360,10 @@ void instr_new_variable_type (const char *new_typename, const char *color) static void recursiveNewUserVariableType (const char *father_type, const char *new_typename, const char *color, type_t root) { - if (!strcmp (root->name, father_type)){ + if (not strcmp(root->name, father_type)) { PJ_type_variable_new (new_typename, color, root); } - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; type_t child_type; char *name; xbt_dict_foreach(root->children, cursor, name, child_type) { @@ -402,10 +378,10 @@ void instr_new_user_variable_type (const char *father_type, const char *new_typ static void recursiveNewUserStateType (const char *father_type, const char *new_typename, type_t root) { - if (!strcmp (root->name, father_type)){ + if (not strcmp(root->name, father_type)) { PJ_type_state_new (new_typename, root); } - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; type_t child_type; char *name; xbt_dict_foreach(root->children, cursor, name, child_type) { @@ -420,10 +396,10 @@ void instr_new_user_state_type (const char *father_type, const char *new_typenam static void recursiveNewValueForUserStateType (const char *type_name, const char *value, const char *color, type_t root) { - if (!strcmp (root->name, type_name)){ + if (not strcmp(root->name, type_name)) { PJ_value_new (value, color, root); } - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; type_t child_type; char *name; xbt_dict_foreach(root->children, cursor, name, child_type) { @@ -443,31 +419,26 @@ int instr_platform_traced () #define GRAPHICATOR_SUPPORT_FUNCTIONS - -static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, - AS_t rc, container_t container) +static void recursiveXBTGraphExtraction(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, sg_netzone_t netzone, + container_t container) { - if (!xbt_dict_is_empty(surf_AS_get_routing_sons(rc))){ - xbt_dict_cursor_t cursor = NULL; - AS_t rc_son; - char *child_name; + if (not netzone->children()->empty()) { //bottom-up recursion - xbt_dict_foreach(surf_AS_get_routing_sons(rc), cursor, child_name, rc_son) { - container_t child_container = (container_t) xbt_dict_get ( - container->children, surf_AS_get_name(rc_son)); - recursiveXBTGraphExtraction (graph, nodes, edges, rc_son, child_container); + for (auto netzone_child : *netzone->children()) { + container_t child_container = static_cast(xbt_dict_get(container->children, netzone_child->name())); + recursiveXBTGraphExtraction(graph, nodes, edges, netzone_child, child_container); } } - surf_AS_get_graph(rc, graph, nodes, edges); + static_cast(netzone)->getGraph(graph, nodes, edges); } -xbt_graph_t instr_routing_platform_graph (void) +xbt_graph_t instr_routing_platform_graph () { - xbt_graph_t ret = xbt_graph_new_graph (0, NULL); - xbt_dict_t nodes = xbt_dict_new_homogeneous(NULL); - xbt_dict_t edges = xbt_dict_new_homogeneous(NULL); - recursiveXBTGraphExtraction (ret, nodes, edges, surf_platf_get_root(routing_platf), PJ_container_get_root()); + xbt_graph_t ret = xbt_graph_new_graph (0, nullptr); + xbt_dict_t nodes = xbt_dict_new_homogeneous(nullptr); + xbt_dict_t edges = xbt_dict_new_homogeneous(nullptr); + recursiveXBTGraphExtraction(ret, nodes, edges, simgrid::s4u::Engine::instance()->netRoot(), PJ_container_get_root()); xbt_dict_free (&nodes); xbt_dict_free (&edges); return ret; @@ -476,11 +447,10 @@ xbt_graph_t instr_routing_platform_graph (void) void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *filename) { unsigned int cursor = 0; - xbt_node_t node = NULL; - xbt_edge_t edge = NULL; - FILE *file = NULL; + xbt_node_t node = nullptr; + xbt_edge_t edge = nullptr; - file = fopen(filename, "w"); + FILE *file = fopen(filename, "w"); xbt_assert(file, "Failed to open %s \n", filename); if (g->directed) @@ -491,8 +461,7 @@ void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *fi fprintf(file, " graph [overlap=scale]\n"); fprintf(file, " node [shape=box, style=filled]\n"); - fprintf(file, - " node [width=.3, height=.3, style=filled, color=skyblue]\n\n"); + fprintf(file, " node [width=.3, height=.3, style=filled, color=skyblue]\n\n"); xbt_dynar_foreach(g->nodes, cursor, node) { fprintf(file, " \"%s\";\n", instr_node_name(node)); @@ -507,5 +476,4 @@ void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *fi } fprintf(file, "}\n"); fclose(file); - }