X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/afd2ff03984f505acd352509ee102f086e0374a3..1d17c885aa26ea6c36c1fc0c6ab39ddd5d509755:/src/surf/instr_routing.cpp diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp index 774ad4b2ee..b70294a5db 100644 --- a/src/surf/instr_routing.cpp +++ b/src/surf/instr_routing.cpp @@ -1,23 +1,22 @@ -/* 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. */ #include "src/instr/instr_private.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" +#include "simgrid/kernel/routing/NetZoneImpl.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" -#include "src/kernel/routing/NetZoneImpl.hpp" -#include "src/kernel/routing/NetPoint.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 std::vector currentContainer; /* push and pop, used only in creation */ static const char *instr_node_name (xbt_node_t node) { @@ -68,7 +67,7 @@ static container_t lowestCommonAncestor (container_t a1, container_t a2) static void linkContainers(container_t src, container_t dst, std::set* filter) { //ignore loopback - if (src->name_ == "__loopback__" || dst->name_ == "__loopback__") { + if (src->get_name() == "__loopback__" || dst->get_name() == "__loopback__") { XBT_DEBUG (" linkContainers: ignoring loopback link"); return; } @@ -80,14 +79,14 @@ static void linkContainers(container_t src, container_t dst, std::setname_ + dst->name_; - std::string aux2 = dst->name_ + src->name_; + std::string aux1 = src->get_name() + dst->get_name(); + std::string aux2 = dst->get_name() + src->get_name(); if (filter->find(aux1) != filter->end()) { - XBT_DEBUG(" linkContainers: already registered %s <-> %s (1)", src->name_.c_str(), dst->name_.c_str()); + XBT_DEBUG(" linkContainers: already registered %s <-> %s (1)", src->get_cname(), dst->get_cname()); return; } if (filter->find(aux2) != filter->end()) { - XBT_DEBUG(" linkContainers: already registered %s <-> %s (2)", dst->name_.c_str(), src->name_.c_str()); + XBT_DEBUG(" linkContainers: already registered %s <-> %s (2)", dst->get_cname(), src->get_cname()); return; } @@ -96,24 +95,25 @@ static void linkContainers(container_t src, container_t dst, std::setinsert(aux2); //declare type - std::string link_typename = father->type_->getName() + "-" + src->type_->getName() + src->type_->getId() + "-" + - dst->type_->getName() + dst->type_->getId(); - simgrid::instr::Type* link_type = father->type_->getOrCreateLinkType(link_typename, src->type_, dst->type_); + std::string link_typename = father->type_->get_name() + "-" + src->type_->get_name() + + std::to_string(src->type_->get_id()) + "-" + dst->type_->get_name() + + std::to_string(dst->type_->get_id()); + 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_type->getName()); + trivaEdgeTypes.insert(link->get_name()); //create the link static long long counter = 0; - char key[INSTR_DEFAULT_STR_SIZE]; - snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter); + std::string key = std::to_string(counter); counter++; - new simgrid::instr::StartLinkEvent(SIMIX_get_clock(), father, link_type, src, "topology", key); - new simgrid::instr::EndLinkEvent(SIMIX_get_clock(), father, link_type, dst, "topology", key); + link->startEvent(src, "topology", key); + link->endEvent(dst, "topology", key); - XBT_DEBUG(" linkContainers %s <-> %s", src->name_.c_str(), dst->name_.c_str()); + XBT_DEBUG(" linkContainers %s <-> %s", src->get_cname(), dst->get_cname()); } static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t container, @@ -123,49 +123,48 @@ static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t XBT_DEBUG("Graph extraction disabled by user."); return; } - XBT_DEBUG("Graph extraction for NetZone = %s", netzone->getCname()); + XBT_DEBUG("Graph extraction for NetZone = %s", netzone->get_cname()); if (not netzone->getChildren()->empty()) { //bottom-up recursion for (auto const& nz_son : *netzone->getChildren()) { - container_t child_container = container->children_.at(nz_son->getCname()); + container_t child_container = container->children_.at(nz_son->get_cname()); recursiveGraphExtraction(nz_son, child_container, filter); } } 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 = nullptr; - char *edge_name; + std::map* nodes = new std::map; + std::map* edges = new std::map; - static_cast(netzone)->getGraph(graph, nodes, edges); - xbt_dict_foreach(edges,cursor,edge_name,edge) { + static_cast(netzone)->get_graph(graph, nodes, edges); + for (auto elm : *edges) { + xbt_edge_t edge = elm.second; linkContainers(simgrid::instr::Container::byName(static_cast(edge->src->data)), simgrid::instr::Container::byName(static_cast(edge->dst->data)), filter); } - xbt_dict_free (&nodes); - xbt_dict_free (&edges); + delete nodes; + delete edges; xbt_graph_free_graph(graph, xbt_free_f, xbt_free_f, nullptr); } /* * Callbacks */ -static void sg_instr_AS_begin(simgrid::s4u::NetZone& netzone) +static void instr_netzone_on_creation(simgrid::s4u::NetZone& netzone) { - std::string id = netzone.getName(); + std::string id = netzone.get_name(); - if (PJ_container_get_root() == nullptr){ - container_t root = new simgrid::instr::Container(id, simgrid::instr::INSTR_AS, nullptr); - PJ_container_set_root (root); + if (simgrid::instr::Container::getRoot() == nullptr) { + simgrid::instr::NetZoneContainer* root = new simgrid::instr::NetZoneContainer(id, 0, nullptr); if (TRACE_smpi_is_enabled()) { simgrid::instr::Type* mpi = root->type_->getOrCreateContainerType("MPI"); if (not TRACE_smpi_is_grouped()) mpi->getOrCreateStateType("MPI_STATE"); - simgrid::instr::Type::getRootType()->getOrCreateLinkType("MPI_LINK", mpi, mpi); + root->type_->getOrCreateLinkType("MPI_LINK", mpi, mpi); + // TODO See if we can move this to the LoadBalancer plugin + root->type_->getOrCreateLinkType("MIGRATE_LINK", mpi, mpi); + mpi->getOrCreateStateType("MIGRATE_STATE"); } if (TRACE_needs_platform()){ @@ -175,214 +174,209 @@ static void sg_instr_AS_begin(simgrid::s4u::NetZone& netzone) } if (TRACE_needs_platform()){ - container_t father = currentContainer.back(); - container_t container = new simgrid::instr::Container(id, simgrid::instr::INSTR_AS, father); + simgrid::instr::NetZoneContainer* container = + new simgrid::instr::NetZoneContainer(id, currentContainer.size(), currentContainer.back()); currentContainer.push_back(container); } } -static void sg_instr_AS_end(simgrid::s4u::NetZone& /*netzone*/) +static void instr_netzone_on_seal(simgrid::s4u::NetZone& /*netzone*/) { if (TRACE_needs_platform()){ currentContainer.pop_back(); } } -static void instr_routing_parse_start_link(simgrid::s4u::Link& link) +static void instr_link_on_creation(simgrid::s4u::Link& link) { if (currentContainer.empty()) // No ongoing parsing. Are you creating the loopback? return; - container_t father = currentContainer.back(); - double bandwidth_value = link.bandwidth(); - double latency_value = link.latency(); - - container_t container = new simgrid::instr::Container(link.getCname(), simgrid::instr::INSTR_LINK, father); + container_t father = currentContainer.back(); + container_t container = new simgrid::instr::Container(link.get_name(), "LINK", father); if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_link())) { - simgrid::instr::Type* bandwidth = container->type_->getOrCreateVariableType("bandwidth", ""); - simgrid::instr::Type* latency = container->type_->getOrCreateVariableType("latency", ""); - new simgrid::instr::SetVariableEvent(0, container, bandwidth, bandwidth_value); - new simgrid::instr::SetVariableEvent(0, container, latency, latency_value); + simgrid::instr::VariableType* bandwidth = container->type_->getOrCreateVariableType("bandwidth", ""); + bandwidth->setCallingContainer(container); + bandwidth->setEvent(0, link.bandwidth()); + simgrid::instr::VariableType* latency = container->type_->getOrCreateVariableType("latency", ""); + latency->setCallingContainer(container); + latency->setEvent(0, link.latency()); } if (TRACE_uncategorized()) { container->type_->getOrCreateVariableType("bandwidth_used", "0.5 0.5 0.5"); } } -static void sg_instr_new_host(simgrid::s4u::Host& host) +static void instr_host_on_creation(simgrid::s4u::Host& host) { - container_t father = currentContainer.back(); - container_t container = new simgrid::instr::Container(host.getCname(), simgrid::instr::INSTR_HOST, father); + container_t container = new simgrid::instr::HostContainer(host, currentContainer.back()); + container_t root = simgrid::instr::Container::getRoot(); if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_speed())) { - simgrid::instr::Type* speed = container->type_->getOrCreateVariableType("power", ""); - - double current_speed_state = host.getSpeed(); - new simgrid::instr::SetVariableEvent(0, container, speed, current_speed_state); + simgrid::instr::VariableType* power = container->type_->getOrCreateVariableType("power", ""); + power->setCallingContainer(container); + power->setEvent(0, host.getSpeed()); } + if (TRACE_uncategorized()) container->type_->getOrCreateVariableType("power_used", "0.5 0.5 0.5"); - if (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()) - container->type_->getOrCreateContainerType("MPI")->getOrCreateStateType("MPI_STATE"); - - if (TRACE_msg_process_is_enabled()) { - simgrid::instr::Type* msg_process = container->type_->getOrCreateContainerType("MSG_PROCESS"); - simgrid::instr::Type* state = msg_process->getOrCreateStateType("MSG_PROCESS_STATE"); - simgrid::instr::Value::byNameOrCreate("suspend", "1 0 1", state); - simgrid::instr::Value::byNameOrCreate("sleep", "1 1 0", state); - simgrid::instr::Value::byNameOrCreate("receive", "1 0 0", state); - simgrid::instr::Value::byNameOrCreate("send", "0 0 1", state); - simgrid::instr::Value::byNameOrCreate("task_execute", "0 1 1", state); - simgrid::instr::Type::getRootType()->getOrCreateLinkType("MSG_PROCESS_LINK", msg_process, msg_process); - simgrid::instr::Type::getRootType()->getOrCreateLinkType("MSG_PROCESS_TASK_LINK", msg_process, msg_process); + if (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()) { + simgrid::instr::ContainerType* mpi = container->type_->getOrCreateContainerType("MPI"); + mpi->getOrCreateStateType("MPI_STATE"); + // TODO See if we can move this to the LoadBalancer plugin + root->type_->getOrCreateLinkType("MIGRATE_LINK", mpi, mpi); + mpi->getOrCreateStateType("MIGRATE_STATE"); + } + + if (TRACE_actor_is_enabled()) { + simgrid::instr::ContainerType* actor = container->type_->getOrCreateContainerType("ACTOR"); + simgrid::instr::StateType* state = actor->getOrCreateStateType("ACTOR_STATE"); + state->addEntityValue("suspend", "1 0 1"); + state->addEntityValue("sleep", "1 1 0"); + state->addEntityValue("receive", "1 0 0"); + state->addEntityValue("send", "0 0 1"); + state->addEntityValue("task_execute", "0 1 1"); + root->type_->getOrCreateLinkType("ACTOR_LINK", actor, actor); + root->type_->getOrCreateLinkType("ACTOR_TASK_LINK", actor, actor); } - if (TRACE_msg_vm_is_enabled()) { - simgrid::instr::Type* msg_vm = container->type_->getOrCreateContainerType("MSG_VM"); - simgrid::instr::Type* state = msg_vm->getOrCreateStateType("MSG_VM_STATE"); - simgrid::instr::Value::byNameOrCreate("suspend", "1 0 1", state); - simgrid::instr::Value::byNameOrCreate("sleep", "1 1 0", state); - simgrid::instr::Value::byNameOrCreate("receive", "1 0 0", state); - simgrid::instr::Value::byNameOrCreate("send", "0 0 1", state); - simgrid::instr::Value::byNameOrCreate("task_execute", "0 1 1", state); - simgrid::instr::Type::getRootType()->getOrCreateLinkType("MSG_VM_LINK", msg_vm, msg_vm); - simgrid::instr::Type::getRootType()->getOrCreateLinkType("MSG_VM_PROCESS_LINK", msg_vm, msg_vm); + if (TRACE_vm_is_enabled()) { + simgrid::instr::ContainerType* msg_vm = container->type_->getOrCreateContainerType("MSG_VM"); + simgrid::instr::StateType* state = msg_vm->getOrCreateStateType("MSG_VM_STATE"); + state->addEntityValue("suspend", "1 0 1"); + state->addEntityValue("sleep", "1 1 0"); + state->addEntityValue("receive", "1 0 0"); + state->addEntityValue("send", "0 0 1"); + state->addEntityValue("task_execute", "0 1 1"); + root->type_->getOrCreateLinkType("MSG_VM_LINK", msg_vm, msg_vm); + root->type_->getOrCreateLinkType("MSG_VM_ACTOR_LINK", msg_vm, msg_vm); } } -static void sg_instr_new_router(simgrid::kernel::routing::NetPoint * netpoint) +static void instr_netpoint_on_creation(simgrid::kernel::routing::NetPoint* netpoint) { - if (not netpoint->isRouter()) - return; - if (TRACE_is_enabled() && TRACE_needs_platform()) { - container_t father = currentContainer.back(); - new simgrid::instr::Container(netpoint->getCname(), simgrid::instr::INSTR_ROUTER, father); - } + if (netpoint->is_router() && TRACE_is_enabled() && TRACE_needs_platform()) + new simgrid::instr::RouterContainer(netpoint->get_cname(), currentContainer.back()); } -static void instr_routing_parse_end_platform () +static void instr_on_platform_created() { currentContainer.clear(); std::set* filter = new std::set; XBT_DEBUG ("Starting graph extraction."); - recursiveGraphExtraction(simgrid::s4u::Engine::getInstance()->getNetRoot(), PJ_container_get_root(), 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); } -void instr_routing_define_callbacks () +void instr_routing_define_callbacks() { - // always need the callbacks to ASes (we need only the root AS), to create the rootContainer and the rootType properly - if (not TRACE_is_enabled()) - return; + // always need the callbacks to zones (we need only the root zone), to create the rootContainer and the rootType + // properly if (TRACE_needs_platform()) { - 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); + simgrid::s4u::Host::onCreation.connect(instr_host_on_creation); + simgrid::s4u::Link::onCreation.connect(instr_link_on_creation); + simgrid::s4u::onPlatformCreated.connect(instr_on_platform_created); } - simgrid::s4u::NetZone::onCreation.connect(sg_instr_AS_begin); - simgrid::s4u::NetZone::onSeal.connect(sg_instr_AS_end); - simgrid::kernel::routing::NetPoint::onCreation.connect(&sg_instr_new_router); + simgrid::s4u::NetZone::onCreation.connect(instr_netzone_on_creation); + simgrid::s4u::NetZone::onSeal.connect(instr_netzone_on_seal); + simgrid::kernel::routing::NetPoint::onCreation.connect(instr_netpoint_on_creation); } /* * user categories support */ -static void recursiveNewVariableType(const char* new_typename, const char* color, simgrid::instr::Type* root) +static void recursiveNewVariableType(std::string new_typename, std::string color, simgrid::instr::Type* root) { - if (root->getName() == "HOST" || root->getName() == "MSG_VM") - root->getOrCreateVariableType(std::string("p") + new_typename, color == nullptr ? "" : color); + if (root->get_name() == "HOST" || root->get_name() == "MSG_VM") + root->getOrCreateVariableType(std::string("p") + new_typename, color); - if (root->getName() == "LINK") - root->getOrCreateVariableType(std::string("b") + new_typename, color == nullptr ? "" : color); + if (root->get_name() == "LINK") + root->getOrCreateVariableType(std::string("b") + new_typename, color); for (auto elm : root->children_) { - recursiveNewVariableType(new_typename, color == nullptr ? "" : color, elm.second); + recursiveNewVariableType(new_typename, color, elm.second); } } -void instr_new_variable_type (const char *new_typename, const char *color) +void instr_new_variable_type(std::string new_typename, std::string color) { - recursiveNewVariableType(new_typename, color, simgrid::instr::Type::getRootType()); + recursiveNewVariableType(new_typename, color, simgrid::instr::Container::getRoot()->type_); } -static void recursiveNewUserVariableType(const char* father_type, const char* new_typename, const char* color, +static void recursiveNewUserVariableType(std::string father_type, std::string new_typename, std::string color, simgrid::instr::Type* root) { - if (root->getName() == father_type) { - root->getOrCreateVariableType(new_typename, color == nullptr ? "" : color); + if (root->get_name() == father_type) { + root->getOrCreateVariableType(new_typename, color); } for (auto elm : root->children_) recursiveNewUserVariableType(father_type, new_typename, color, elm.second); } -void instr_new_user_variable_type (const char *father_type, const char *new_typename, const char *color) +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::Type::getRootType()); + recursiveNewUserVariableType(father_type, new_typename, color, simgrid::instr::Container::getRoot()->type_); } -static void recursiveNewUserStateType(const char* father_type, const char* new_typename, simgrid::instr::Type* root) +static void recursiveNewUserStateType(std::string father_type, std::string new_typename, simgrid::instr::Type* root) { - if (root->getName() == father_type) { + if (root->get_name() == father_type) root->getOrCreateStateType(new_typename); - } + for (auto elm : root->children_) recursiveNewUserStateType(father_type, new_typename, elm.second); } -void instr_new_user_state_type (const char *father_type, const char *new_typename) +void instr_new_user_state_type(std::string father_type, std::string new_typename) { - recursiveNewUserStateType(father_type, new_typename, simgrid::instr::Type::getRootType()); + recursiveNewUserStateType(father_type, new_typename, simgrid::instr::Container::getRoot()->type_); } -static void recursiveNewValueForUserStateType(const char* type_name, const char* val, const char* color, +static void recursiveNewValueForUserStateType(std::string type_name, const char* val, std::string color, simgrid::instr::Type* root) { - if (root->getName() == type_name) - simgrid::instr::Value::byNameOrCreate(val, color, root); + if (root->get_name() == type_name) + static_cast(root)->addEntityValue(val, color); for (auto elm : root->children_) recursiveNewValueForUserStateType(type_name, val, color, elm.second); } -void instr_new_value_for_user_state_type (const char *type_name, const char *value, const char *color) -{ - recursiveNewValueForUserStateType(type_name, value, color, simgrid::instr::Type::getRootType()); -} - -int instr_platform_traced () +void instr_new_value_for_user_state_type(std::string type_name, const char* value, std::string color) { - return platform_created; + recursiveNewValueForUserStateType(type_name, value, color, simgrid::instr::Container::getRoot()->type_); } #define GRAPHICATOR_SUPPORT_FUNCTIONS -static void recursiveXBTGraphExtraction(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, sg_netzone_t netzone, +static void recursiveXBTGraphExtraction(xbt_graph_t graph, std::map* nodes, + std::map* edges, sg_netzone_t netzone, container_t container) { if (not netzone->getChildren()->empty()) { //bottom-up recursion for (auto const& netzone_child : *netzone->getChildren()) { - container_t child_container = container->children_.at(netzone_child->getCname()); + container_t child_container = container->children_.at(netzone_child->get_cname()); recursiveXBTGraphExtraction(graph, nodes, edges, netzone_child, child_container); } } - static_cast(netzone)->getGraph(graph, nodes, edges); + static_cast(netzone)->get_graph(graph, nodes, edges); } xbt_graph_t instr_routing_platform_graph () { 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); + std::map* nodes = new std::map; + std::map* edges = new std::map; recursiveXBTGraphExtraction(ret, nodes, edges, simgrid::s4u::Engine::getInstance()->getNetRoot(), - PJ_container_get_root()); - xbt_dict_free (&nodes); - xbt_dict_free (&edges); + simgrid::instr::Container::getRoot()); + delete nodes; + delete edges; return ret; }