X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0e4aeb6a5d4165c8ba038514f09da26751a93538..aec830b8423c13c5c31e3db71361a449bfacd8ed:/src/surf/instr_routing.cpp diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp index f59898f3c5..05c22a137d 100644 --- a/src/surf/instr_routing.cpp +++ b/src/surf/instr_routing.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2018. 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. */ @@ -7,16 +7,15 @@ #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" -#include "src/kernel/routing/NetZoneImpl.hpp" #include "src/kernel/routing/NetPoint.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 "surf/surf.hpp" #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 std::vector currentContainer; /* push and pop, used only in creation */ static const char *instr_node_name (xbt_node_t node) @@ -100,6 +99,7 @@ static void linkContainers(container_t src, container_t dst, std::settype_->getId()) + "-" + dst->type_->getName() + std::to_string(dst->type_->getId()); simgrid::instr::LinkType* link = father->type_->getOrCreateLinkType(link_typename, src->type_, dst->type_); + link->setCallingContainer(father); //register EDGE types for triva configuration trivaEdgeTypes.insert(link->getName()); @@ -110,8 +110,8 @@ static void linkContainers(container_t src, container_t dst, std::setstartEvent(father, src, "topology", key); - link->endEvent(father, dst, "topology", key); + link->startEvent(src, "topology", key); + link->endEvent(dst, "topology", key); XBT_DEBUG(" linkContainers %s <-> %s", src->getCname(), dst->getCname()); } @@ -154,7 +154,7 @@ static void sg_instr_AS_begin(simgrid::s4u::NetZone& netzone) { std::string id = netzone.getName(); - if (simgrid::instr::Container::getRootContainer() == nullptr) { + if (simgrid::instr::Container::getRoot() == nullptr) { simgrid::instr::NetZoneContainer* root = new simgrid::instr::NetZoneContainer(id, 0, nullptr); if (TRACE_smpi_is_enabled()) { @@ -208,7 +208,7 @@ static void instr_routing_parse_start_link(simgrid::s4u::Link& link) static void sg_instr_new_host(simgrid::s4u::Host& host) { container_t container = new simgrid::instr::HostContainer(host, currentContainer.back()); - container_t root = simgrid::instr::Container::getRootContainer(); + container_t root = simgrid::instr::Container::getRoot(); if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_speed())) { simgrid::instr::VariableType* power = container->type_->getOrCreateVariableType("power", ""); @@ -222,7 +222,7 @@ static void sg_instr_new_host(simgrid::s4u::Host& host) if (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()) container->type_->getOrCreateContainerType("MPI")->getOrCreateStateType("MPI_STATE"); - if (TRACE_msg_process_is_enabled()) { + if (TRACE_actor_is_enabled()) { simgrid::instr::ContainerType* msg_process = container->type_->getOrCreateContainerType("MSG_PROCESS"); simgrid::instr::StateType* state = msg_process->getOrCreateStateType("MSG_PROCESS_STATE"); state->addEntityValue("suspend", "1 0 1"); @@ -258,11 +258,10 @@ static void instr_routing_parse_end_platform () currentContainer.clear(); std::set* filter = new std::set; XBT_DEBUG ("Starting graph extraction."); - recursiveGraphExtraction(simgrid::s4u::Engine::getInstance()->getNetRoot(), - simgrid::instr::Container::getRootContainer(), filter); + recursiveGraphExtraction(simgrid::s4u::Engine::getInstance()->getNetRoot(), simgrid::instr::Container::getRoot(), + filter); XBT_DEBUG ("Graph extraction finished."); delete filter; - platform_created = 1; TRACE_paje_dump_buffer(true); } @@ -298,7 +297,7 @@ static void recursiveNewVariableType(std::string new_typename, std::string color void instr_new_variable_type(std::string new_typename, std::string color) { - recursiveNewVariableType(new_typename, color, simgrid::instr::Container::getRootContainer()->type_); + recursiveNewVariableType(new_typename, color, simgrid::instr::Container::getRoot()->type_); } static void recursiveNewUserVariableType(std::string father_type, std::string new_typename, std::string color, @@ -313,7 +312,7 @@ static void recursiveNewUserVariableType(std::string father_type, std::string ne void instr_new_user_variable_type(std::string father_type, std::string new_typename, std::string color) { - recursiveNewUserVariableType(father_type, new_typename, color, simgrid::instr::Container::getRootContainer()->type_); + recursiveNewUserVariableType(father_type, new_typename, color, simgrid::instr::Container::getRoot()->type_); } static void recursiveNewUserStateType(std::string father_type, std::string new_typename, simgrid::instr::Type* root) @@ -327,7 +326,7 @@ static void recursiveNewUserStateType(std::string father_type, std::string new_t void instr_new_user_state_type(std::string father_type, std::string new_typename) { - recursiveNewUserStateType(father_type, new_typename, simgrid::instr::Container::getRootContainer()->type_); + recursiveNewUserStateType(father_type, new_typename, simgrid::instr::Container::getRoot()->type_); } static void recursiveNewValueForUserStateType(std::string type_name, const char* val, std::string color, @@ -342,12 +341,7 @@ static void recursiveNewValueForUserStateType(std::string type_name, const char* void instr_new_value_for_user_state_type(std::string type_name, const char* value, std::string color) { - recursiveNewValueForUserStateType(type_name, value, color, simgrid::instr::Container::getRootContainer()->type_); -} - -int instr_platform_traced () -{ - return platform_created; + recursiveNewValueForUserStateType(type_name, value, color, simgrid::instr::Container::getRoot()->type_); } #define GRAPHICATOR_SUPPORT_FUNCTIONS @@ -373,7 +367,7 @@ xbt_graph_t instr_routing_platform_graph () std::map* nodes = new std::map; std::map* edges = new std::map; recursiveXBTGraphExtraction(ret, nodes, edges, simgrid::s4u::Engine::getInstance()->getNetRoot(), - simgrid::instr::Container::getRootContainer()); + simgrid::instr::Container::getRoot()); delete nodes; delete edges; return ret;