#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");
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());
- simgrid::instr::Type* link_type = father->type_->getOrCreateLinkType(link_typename, src->type_, dst->type_);
+ 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->getName());
//create the link
static long long counter = 0;
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->getCname(), dst->getCname());
}
{
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()) {
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);
}
if (TRACE_needs_platform()){
container_t container = new simgrid::instr::Container(link.getName(), "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, link.bandwidth());
- new simgrid::instr::SetVariableEvent(0, container, latency, link.latency());
+ 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)
{
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", "");
- new simgrid::instr::SetVariableEvent(0, container, speed, host.getSpeed());
+ simgrid::instr::VariableType* power = container->type_->getOrCreateVariableType("power", "");
+ power->setCallingContainer(container);
+ power->setEvent(0, host.getSpeed());
}
if (TRACE_uncategorized())
state->addEntityValue("receive", "1 0 0");
state->addEntityValue("send", "0 0 1");
state->addEntityValue("task_execute", "0 1 1");
- 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);
+ root->type_->getOrCreateLinkType("MSG_PROCESS_LINK", msg_process, msg_process);
+ root->type_->getOrCreateLinkType("MSG_PROCESS_TASK_LINK", msg_process, msg_process);
}
if (TRACE_msg_vm_is_enabled()) {
state->addEntityValue("receive", "1 0 0");
state->addEntityValue("send", "0 0 1");
state->addEntityValue("task_execute", "0 1 1");
- 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);
+ root->type_->getOrCreateLinkType("MSG_VM_LINK", msg_vm, msg_vm);
+ root->type_->getOrCreateLinkType("MSG_VM_PROCESS_LINK", msg_vm, msg_vm);
}
}
currentContainer.clear();
std::set<std::string>* filter = new std::set<std::string>;
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;
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(std::string father_type, std::string new_typename, std::string 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(std::string father_type, std::string new_typename, simgrid::instr::Type* root)
{
- if (root->getName() == father_type) {
+ if (root->getName() == father_type)
root->getOrCreateStateType(new_typename);
- }
+
for (auto elm : root->children_)
recursiveNewUserStateType(father_type, new_typename, elm.second);
}
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(std::string type_name, const char* val, std::string color,
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::Type::getRootType());
+ recursiveNewValueForUserStateType(type_name, value, color, simgrid::instr::Container::getRoot()->type_);
}
int instr_platform_traced ()
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>;
recursiveXBTGraphExtraction(ret, nodes, edges, simgrid::s4u::Engine::getInstance()->getNetRoot(),
- simgrid::instr::Container::getRootContainer());
+ simgrid::instr::Container::getRoot());
delete nodes;
delete edges;
return ret;