-/* 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/NetPoint.hpp"
-#include "src/kernel/routing/NetZoneImpl.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
#include "surf/surf.hpp"
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<simgrid::instr::NetZoneContainer*> currentContainer; /* push and pop, used only in creation */
static const char *instr_node_name (xbt_node_t node)
static void linkContainers(container_t src, container_t dst, std::set<std::string>* filter)
{
//ignore loopback
- if (src->getName() == "__loopback__" || dst->getName() == "__loopback__") {
+ if (src->get_name() == "__loopback__" || dst->get_name() == "__loopback__") {
XBT_DEBUG (" linkContainers: ignoring loopback link");
return;
}
}
// check if we already register this pair (we only need one direction)
- std::string aux1 = src->getName() + dst->getName();
- std::string aux2 = dst->getName() + src->getName();
+ 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->getCname(), dst->getCname());
+ 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->getCname(), src->getCname());
+ XBT_DEBUG(" linkContainers: already registered %s <-> %s (2)", dst->get_cname(), src->get_cname());
return;
}
filter->insert(aux2);
//declare type
- std::string link_typename = father->type_->getName() + "-" + src->type_->getName() +
- std::to_string(src->type_->getId()) + "-" + dst->type_->getName() +
- std::to_string(dst->type_->getId());
+ 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->getName());
+ trivaEdgeTypes.insert(link->get_name());
//create the link
static long long counter = 0;
link->startEvent(src, "topology", key);
link->endEvent(dst, "topology", key);
- XBT_DEBUG(" linkContainers %s <-> %s", src->getCname(), dst->getCname());
+ XBT_DEBUG(" linkContainers %s <-> %s", src->get_cname(), dst->get_cname());
}
static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t container,
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);
}
}
std::map<std::string, xbt_node_t>* nodes = new std::map<std::string, xbt_node_t>;
std::map<std::string, xbt_edge_t>* edges = new std::map<std::string, xbt_edge_t>;
- static_cast<simgrid::kernel::routing::NetZoneImpl*>(netzone)->getGraph(graph, nodes, edges);
+ static_cast<simgrid::kernel::routing::NetZoneImpl*>(netzone)->get_graph(graph, nodes, edges);
for (auto elm : *edges) {
xbt_edge_t edge = elm.second;
linkContainers(simgrid::instr::Container::byName(static_cast<const char*>(edge->src->data)),
/*
* 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 (simgrid::instr::Container::getRoot() == nullptr) {
simgrid::instr::NetZoneContainer* root = new simgrid::instr::NetZoneContainer(id, 0, nullptr);
if (not TRACE_smpi_is_grouped())
mpi->getOrCreateStateType("MPI_STATE");
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()){
}
}
-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();
- container_t container = new simgrid::instr::Container(link.getName(), "LINK", father);
+ 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::VariableType* bandwidth = container->type_->getOrCreateVariableType("bandwidth", "");
}
}
-static void sg_instr_new_host(simgrid::s4u::Host& host)
+static void instr_host_on_creation(simgrid::s4u::Host& host)
{
container_t container = new simgrid::instr::HostContainer(host, currentContainer.back());
container_t root = simgrid::instr::Container::getRoot();
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_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_msg_process_is_enabled()) {
- simgrid::instr::ContainerType* msg_process = container->type_->getOrCreateContainerType("MSG_PROCESS");
- simgrid::instr::StateType* state = msg_process->getOrCreateStateType("MSG_PROCESS_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("MSG_PROCESS_LINK", msg_process, msg_process);
- root->type_->getOrCreateLinkType("MSG_PROCESS_TASK_LINK", msg_process, msg_process);
+ root->type_->getOrCreateLinkType("ACTOR_LINK", actor, actor);
+ root->type_->getOrCreateLinkType("ACTOR_TASK_LINK", actor, actor);
}
- if (TRACE_msg_vm_is_enabled()) {
+ 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("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_PROCESS_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 (netpoint->isRouter() && TRACE_is_enabled() && TRACE_needs_platform())
- new simgrid::instr::RouterContainer(netpoint->getCname(), currentContainer.back());
+ 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<std::string>* filter = new std::set<std::string>;
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(std::string new_typename, std::string color, simgrid::instr::Type* root)
{
- if (root->getName() == "HOST" || root->getName() == "MSG_VM")
+ if (root->get_name() == "HOST" || root->get_name() == "MSG_VM")
root->getOrCreateVariableType(std::string("p") + new_typename, color);
- if (root->getName() == "LINK")
+ if (root->get_name() == "LINK")
root->getOrCreateVariableType(std::string("b") + new_typename, color);
for (auto elm : root->children_) {
static void recursiveNewUserVariableType(std::string father_type, std::string new_typename, std::string color,
simgrid::instr::Type* root)
{
- if (root->getName() == father_type) {
+ if (root->get_name() == father_type) {
root->getOrCreateVariableType(new_typename, color);
}
for (auto elm : root->children_)
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_)
static void recursiveNewValueForUserStateType(std::string type_name, const char* val, std::string color,
simgrid::instr::Type* root)
{
- if (root->getName() == type_name)
+ if (root->get_name() == type_name)
static_cast<simgrid::instr::StateType*>(root)->addEntityValue(val, color);
for (auto elm : root->children_)
recursiveNewValueForUserStateType(type_name, value, color, simgrid::instr::Container::getRoot()->type_);
}
-int instr_platform_traced ()
-{
- return platform_created;
-}
-
#define GRAPHICATOR_SUPPORT_FUNCTIONS
static void recursiveXBTGraphExtraction(xbt_graph_t graph, std::map<std::string, xbt_node_t>* nodes,
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<simgrid::kernel::routing::NetZoneImpl*>(netzone)->getGraph(graph, nodes, edges);
+ static_cast<simgrid::kernel::routing::NetZoneImpl*>(netzone)->get_graph(graph, nodes, edges);
}
xbt_graph_t instr_routing_platform_graph ()
