/* 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.h"
+#include "src/instr/instr_private.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
return p;
}
-static void linkContainers (container_t src, container_t dst, xbt_dict_t filter)
+static void linkContainers(container_t src, container_t dst, std::set<std::string>* filter)
{
//ignore loopback
- if (strcmp(src->name_, "__loopback__") == 0 || strcmp(dst->name_, "__loopback__") == 0) {
+ if (src->name_ == "__loopback__" || dst->name_ == "__loopback__") {
XBT_DEBUG (" linkContainers: ignoring loopback link");
return;
}
xbt_die ("common father unknown, this is a tracing problem");
}
- if (filter != nullptr){
- //check if we already register this pair (we only need one direction)
- char aux1[INSTR_DEFAULT_STR_SIZE];
- char aux2[INSTR_DEFAULT_STR_SIZE];
- snprintf(aux1, INSTR_DEFAULT_STR_SIZE, "%s%s", src->name_, dst->name_);
- snprintf(aux2, INSTR_DEFAULT_STR_SIZE, "%s%s", dst->name_, src->name_);
- if (xbt_dict_get_or_null (filter, aux1)){
- XBT_DEBUG(" linkContainers: already registered %s <-> %s (1)", src->name_, dst->name_);
- return;
- }
- if (xbt_dict_get_or_null (filter, aux2)){
- XBT_DEBUG(" linkContainers: already registered %s <-> %s (2)", dst->name_, src->name_);
- return;
- }
-
- //ok, not found, register it
- xbt_dict_set (filter, aux1, xbt_strdup ("1"), nullptr);
- xbt_dict_set (filter, aux2, xbt_strdup ("1"), nullptr);
+ // check if we already register this pair (we only need one direction)
+ std::string aux1 = src->name_ + dst->name_;
+ std::string aux2 = dst->name_ + src->name_;
+ if (filter->find(aux1) != filter->end()) {
+ XBT_DEBUG(" linkContainers: already registered %s <-> %s (1)", src->name_.c_str(), dst->name_.c_str());
+ return;
+ }
+ if (filter->find(aux2) != filter->end()) {
+ XBT_DEBUG(" linkContainers: already registered %s <-> %s (2)", dst->name_.c_str(), src->name_.c_str());
+ return;
}
+ // ok, not found, register it
+ filter->insert(aux1);
+ filter->insert(aux2);
+
//declare type
char link_typename[INSTR_DEFAULT_STR_SIZE];
snprintf(link_typename, INSTR_DEFAULT_STR_SIZE, "%s-%s%s-%s%s", father->type_->name_, src->type_->name_,
src->type_->id_, dst->type_->name_, dst->type_->id_);
- simgrid::instr::Type* link_type = simgrid::instr::Type::getOrNull(link_typename, father->type_);
- if (link_type == nullptr){
+ simgrid::instr::Type* link_type = father->type_->getChildOrNull(link_typename);
+ if (link_type == nullptr)
link_type = simgrid::instr::Type::linkNew(link_typename, father->type_, src->type_, dst->type_);
- }
//register EDGE types for triva configuration
trivaEdgeTypes.insert(link_type->name_);
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);
- XBT_DEBUG(" linkContainers %s <-> %s", src->name_, dst->name_);
+ XBT_DEBUG(" linkContainers %s <-> %s", src->name_.c_str(), dst->name_.c_str());
}
-static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t container, xbt_dict_t filter)
+static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t container,
+ std::set<std::string>* filter)
{
if (not TRACE_platform_topology()) {
XBT_DEBUG("Graph extraction disabled by user.");
if (not netzone->getChildren()->empty()) {
//bottom-up recursion
for (auto const& nz_son : *netzone->getChildren()) {
- container_t child_container = static_cast<container_t>(xbt_dict_get(container->children_, nz_son->getCname()));
+ container_t child_container = container->children_.at(nz_son->getCname());
recursiveGraphExtraction(nz_son, child_container, filter);
}
}
PJ_container_set_root (root);
if (TRACE_smpi_is_enabled()) {
- simgrid::instr::Type* mpi = simgrid::instr::Type::getOrNull("MPI", root->type_);
+ simgrid::instr::Type* mpi = root->type_->getChildOrNull("MPI");
if (mpi == nullptr){
mpi = simgrid::instr::Type::containerNew("MPI", root->type_);
if (not TRACE_smpi_is_grouped())
container_t container = new simgrid::instr::Container(link.name(), simgrid::instr::INSTR_LINK, father);
if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_link())) {
- simgrid::instr::Type* bandwidth = simgrid::instr::Type::getOrNull("bandwidth", container->type_);
- if (bandwidth == nullptr) {
+ simgrid::instr::Type* bandwidth = container->type_->getChildOrNull("bandwidth");
+ if (bandwidth == nullptr)
bandwidth = simgrid::instr::Type::variableNew("bandwidth", nullptr, container->type_);
- }
- simgrid::instr::Type* latency = simgrid::instr::Type::getOrNull("latency", container->type_);
- if (latency == nullptr) {
+ simgrid::instr::Type* latency = container->type_->getChildOrNull("latency");
+ if (latency == nullptr)
latency = simgrid::instr::Type::variableNew("latency", nullptr, container->type_);
- }
new simgrid::instr::SetVariableEvent(0, container, bandwidth, bandwidth_value);
new simgrid::instr::SetVariableEvent(0, container, latency, latency_value);
}
if (TRACE_uncategorized()) {
- simgrid::instr::Type* bandwidth_used = simgrid::instr::Type::getOrNull("bandwidth_used", container->type_);
- if (bandwidth_used == nullptr) {
+ simgrid::instr::Type* bandwidth_used = container->type_->getChildOrNull("bandwidth_used");
+ if (bandwidth_used == nullptr)
simgrid::instr::Type::variableNew("bandwidth_used", "0.5 0.5 0.5", container->type_);
- }
}
}
container_t container = new simgrid::instr::Container(host.getCname(), simgrid::instr::INSTR_HOST, father);
if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_speed())) {
- simgrid::instr::Type* speed = simgrid::instr::Type::getOrNull("power", container->type_);
+ simgrid::instr::Type* speed = container->type_->getChildOrNull("power");
if (speed == nullptr){
speed = simgrid::instr::Type::variableNew("power", nullptr, container->type_);
}
new simgrid::instr::SetVariableEvent(0, container, speed, current_speed_state);
}
if (TRACE_uncategorized()){
- simgrid::instr::Type* speed_used = simgrid::instr::Type::getOrNull("power_used", container->type_);
+ simgrid::instr::Type* speed_used = container->type_->getChildOrNull("power_used");
if (speed_used == nullptr){
simgrid::instr::Type::variableNew("power_used", "0.5 0.5 0.5", container->type_);
}
}
if (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()){
- simgrid::instr::Type* mpi = simgrid::instr::Type::getOrNull("MPI", container->type_);
+ simgrid::instr::Type* mpi = container->type_->getChildOrNull("MPI");
if (mpi == nullptr){
mpi = simgrid::instr::Type::containerNew("MPI", container->type_);
simgrid::instr::Type::stateNew("MPI_STATE", mpi);
}
if (TRACE_msg_process_is_enabled()) {
- simgrid::instr::Type* msg_process = simgrid::instr::Type::getOrNull("MSG_PROCESS", container->type_);
+ simgrid::instr::Type* msg_process = container->type_->getChildOrNull("MSG_PROCESS");
if (msg_process == nullptr){
msg_process = simgrid::instr::Type::containerNew("MSG_PROCESS", container->type_);
simgrid::instr::Type* state = simgrid::instr::Type::stateNew("MSG_PROCESS_STATE", msg_process);
- simgrid::instr::Value PJ_value("suspend", "1 0 1", state);
+ new simgrid::instr::Value("suspend", "1 0 1", state);
simgrid::instr::Value::get_or_new("sleep", "1 1 0", state);
simgrid::instr::Value::get_or_new("receive", "1 0 0", state);
simgrid::instr::Value::get_or_new("send", "0 0 1", state);
}
if (TRACE_msg_vm_is_enabled()) {
- simgrid::instr::Type* msg_vm = simgrid::instr::Type::getOrNull("MSG_VM", container->type_);
+ simgrid::instr::Type* msg_vm = container->type_->getChildOrNull("MSG_VM");
if (msg_vm == nullptr){
msg_vm = simgrid::instr::Type::containerNew("MSG_VM", container->type_);
simgrid::instr::Type* state = simgrid::instr::Type::stateNew("MSG_VM_STATE", msg_vm);
- simgrid::instr::Value PJ_value("suspend", "1 0 1", state);
+ new simgrid::instr::Value("suspend", "1 0 1", state);
simgrid::instr::Value::get_or_new("sleep", "1 1 0", state);
simgrid::instr::Value::get_or_new("receive", "1 0 0", state);
simgrid::instr::Value::get_or_new("send", "0 0 1", state);
simgrid::instr::Type::linkNew("MSG_VM_PROCESS_LINK", PJ_type_get_root(), msg_vm, msg_vm);
}
}
-
}
static void sg_instr_new_router(simgrid::kernel::routing::NetPoint * netpoint)
static void instr_routing_parse_end_platform ()
{
currentContainer.clear();
- xbt_dict_t filter = xbt_dict_new_homogeneous(xbt_free_f);
+ std::set<std::string>* filter = new std::set<std::string>;
XBT_DEBUG ("Starting graph extraction.");
recursiveGraphExtraction(simgrid::s4u::Engine::getInstance()->getNetRoot(), PJ_container_get_root(), filter);
XBT_DEBUG ("Graph extraction finished.");
- xbt_dict_free(&filter);
+ delete filter;
platform_created = 1;
TRACE_paje_dump_buffer(1);
}
simgrid::instr::Type* root)
{
if (not strcmp(root->name_, type_name)) {
- simgrid::instr::Value PJ_value(val, color, root);
+ new simgrid::instr::Value(val, color, root);
}
xbt_dict_cursor_t cursor = nullptr;
simgrid::instr::Type* child_type;
if (not netzone->getChildren()->empty()) {
//bottom-up recursion
for (auto const& netzone_child : *netzone->getChildren()) {
- container_t child_container =
- static_cast<container_t>(xbt_dict_get(container->children_, netzone_child->getCname()));
+ container_t child_container = container->children_.at(netzone_child->getCname());
recursiveXBTGraphExtraction(graph, nodes, edges, netzone_child, child_container);
}
}