From 68819337078a47f1dbb14f2a0dc4aa8a7b7aecd0 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 2 Jan 2017 16:38:06 +0100 Subject: [PATCH] remove an unused parameter + cosmetics --- src/kernel/routing/NetCard.hpp | 2 +- src/surf/instr_routing.cpp | 8 +++++--- src/surf/sg_platf.cpp | 3 +-- src/surf/xml/platf_private.hpp | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/kernel/routing/NetCard.hpp b/src/kernel/routing/NetCard.hpp index bffc783c3a..4f285c339b 100644 --- a/src/kernel/routing/NetCard.hpp +++ b/src/kernel/routing/NetCard.hpp @@ -22,7 +22,7 @@ namespace routing { /** @ingroup ROUTING_API * @brief Network cards are the vertices in the graph representing the network, used to compute paths between nodes. * - * @details This represents a position in the network. One can route information between two netcards + * @details This represents a position in the network. One can send information between two netcards */ class NetCard : public simgrid::xbt::Extendable { diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp index 43bfc4153a..5401f123ab 100644 --- a/src/surf/instr_routing.cpp +++ b/src/surf/instr_routing.cpp @@ -297,10 +297,12 @@ void sg_instr_new_host(simgrid::s4u::Host& host) } -void sg_instr_new_router(const char* name, const char* coords) +void sg_instr_new_router(const char* name) { - container_t father = currentContainer.back(); - PJ_container_new(name, 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 () diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index fa37309f1d..49897a1f8e 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -112,8 +112,7 @@ simgrid::kernel::routing::NetCard* sg_platf_new_router(const char* name, const c if (coords && strcmp(coords, "")) new simgrid::kernel::routing::vivaldi::Coords(netcard, coords); - if (TRACE_is_enabled() && TRACE_needs_platform()) - sg_instr_new_router(name, coords); + sg_instr_new_router(name); return netcard; } diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index dbbe39bb50..e3edce6d4b 100644 --- a/src/surf/xml/platf_private.hpp +++ b/src/surf/xml/platf_private.hpp @@ -240,7 +240,7 @@ XBT_PUBLIC_DATA(int) surfxml_bufferstack_size; XBT_PUBLIC(void) routing_route_free(sg_platf_route_cbarg_t route); /********** Instr. **********/ XBT_PRIVATE void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS); -XBT_PRIVATE void sg_instr_new_router(const char* name, const char* coords); +XBT_PRIVATE void sg_instr_new_router(const char* name); XBT_PRIVATE void sg_instr_new_host(simgrid::s4u::Host& host); XBT_PRIVATE void sg_instr_AS_end(); -- 2.20.1