-/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2022. 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/Actor.hpp>
+#include <simgrid/s4u/Comm.hpp>
+#include <simgrid/s4u/Engine.hpp>
+#include <simgrid/s4u/Exec.hpp>
+#include <simgrid/s4u/Host.hpp>
+#include <simgrid/s4u/VirtualMachine.hpp>
+#include <xbt/graph.h>
-#include "simgrid/kernel/routing/NetPoint.hpp"
-#include "simgrid/kernel/routing/NetZoneImpl.hpp"
-#include "simgrid/s4u/Actor.hpp"
-#include "simgrid/s4u/Comm.hpp"
-#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Exec.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/VirtualMachine.hpp"
-#include "src/surf/cpu_interface.hpp"
-#include "src/surf/network_interface.hpp"
+#include "src/instr/instr_private.hpp"
+#include "src/kernel/resource/CpuImpl.hpp"
+#include "src/kernel/resource/StandardLinkImpl.hpp"
#include "src/surf/surf_interface.hpp"
-#include "src/surf/xml/platf_private.hpp"
-#include "surf/surf.hpp"
-#include "xbt/graph.h"
#include <fstream>
const simgrid::instr::Container* a2)
{
// this is only an optimization (since most of a1 and a2 share the same parent)
- if (a1->father_ == a2->father_)
- return a1->father_;
+ if (a1->get_parent() == a2->get_parent())
+ return a1->get_parent();
// create an array with all ancestors of a1
std::vector<simgrid::instr::Container*> ancestors_a1;
- for (auto* p = a1->father_; p != nullptr; p = p->father_)
+ for (auto* p = a1->get_parent(); p != nullptr; p = p->get_parent())
ancestors_a1.push_back(p);
// create an array with all ancestors of a2
std::vector<simgrid::instr::Container*> ancestors_a2;
- for (auto* p = a2->father_; p != nullptr; p = p->father_)
+ for (auto* p = a2->get_parent(); p != nullptr; p = p->get_parent())
ancestors_a2.push_back(p);
// find the lowest ancestor
return;
}
- // find common father
- simgrid::instr::Container* father = lowestCommonAncestor(src, dst);
- xbt_assert(father, "common father unknown, this is a tracing problem");
+ // find common parent
+ simgrid::instr::Container* parent = lowestCommonAncestor(src, dst);
+ xbt_assert(parent, "common parent unknown, this is a tracing problem");
// check if we already register this pair (we only need one direction)
std::string aux1 = src->get_name() + dst->get_name();
filter->insert(aux2);
// declare 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_->by_name_or_create(link_typename, src->type_, dst->type_);
- link->set_calling_container(father);
+ std::string link_typename = parent->get_type()->get_name() + "-" + src->get_type()->get_name() +
+ std::to_string(src->get_type()->get_id()) + "-" + dst->get_type()->get_name() +
+ std::to_string(dst->get_type()->get_id());
+ simgrid::instr::LinkType* link =
+ parent->get_type()->by_name_or_create(link_typename, src->get_type(), dst->get_type());
+ link->set_calling_container(parent);
// create the link
static long long counter = 0;
XBT_DEBUG(" linkContainers %s <-> %s", src->get_cname(), dst->get_cname());
}
-static void recursiveGraphExtraction(const simgrid::s4u::NetZone* netzone, simgrid::instr::Container* container,
+static void recursiveGraphExtraction(const simgrid::s4u::NetZone* netzone, const simgrid::instr::Container* container,
std::set<std::string, std::less<>>* filter)
{
if (not TRACE_platform_topology()) {
return;
}
XBT_DEBUG("Graph extraction for NetZone = %s", netzone->get_cname());
- if (not netzone->get_children().empty()) {
- // bottom-up recursion
- for (auto const& nz_son : netzone->get_children()) {
- simgrid::instr::Container* child_container = container->children_.at(nz_son->get_name());
- recursiveGraphExtraction(nz_son, child_container, filter);
- }
+
+ // bottom-up recursion
+ for (auto const& nz_son : netzone->get_children()) {
+ const simgrid::instr::Container* child_container = container->get_child_by_name(nz_son->get_name());
+ recursiveGraphExtraction(nz_son, child_container, filter);
}
auto* graph = xbt_graph_new_graph(0, nullptr);
void instr_new_variable_type(const std::string& new_typename, const std::string& color)
{
- recursiveNewVariableType(new_typename, color, simgrid::instr::Container::get_root()->type_);
+ recursiveNewVariableType(new_typename, color, simgrid::instr::Container::get_root()->get_type());
}
-static void recursiveNewUserVariableType(const std::string& father_type, const std::string& new_typename,
+static void recursiveNewUserVariableType(const std::string& parent_type, const std::string& new_typename,
const std::string& color, simgrid::instr::Type* root)
{
- if (root->get_name() == father_type) {
+ if (root->get_name() == parent_type) {
root->by_name_or_create(new_typename, color);
}
for (auto const& elm : root->get_children())
- recursiveNewUserVariableType(father_type, new_typename, color, elm.second.get());
+ recursiveNewUserVariableType(parent_type, new_typename, color, elm.second.get());
}
-void instr_new_user_variable_type(const std::string& father_type, const std::string& new_typename,
+void instr_new_user_variable_type(const std::string& parent_type, const std::string& new_typename,
const std::string& color)
{
- recursiveNewUserVariableType(father_type, new_typename, color, simgrid::instr::Container::get_root()->type_);
+ recursiveNewUserVariableType(parent_type, new_typename, color, simgrid::instr::Container::get_root()->get_type());
}
-static void recursiveNewUserStateType(const std::string& father_type, const std::string& new_typename,
+static void recursiveNewUserStateType(const std::string& parent_type, const std::string& new_typename,
simgrid::instr::Type* root)
{
- if (root->get_name() == father_type)
+ if (root->get_name() == parent_type)
root->by_name_or_create<simgrid::instr::StateType>(new_typename);
for (auto const& elm : root->get_children())
- recursiveNewUserStateType(father_type, new_typename, elm.second.get());
+ recursiveNewUserStateType(parent_type, new_typename, elm.second.get());
}
-void instr_new_user_state_type(const std::string& father_type, const std::string& new_typename)
+void instr_new_user_state_type(const std::string& parent_type, const std::string& new_typename)
{
- recursiveNewUserStateType(father_type, new_typename, simgrid::instr::Container::get_root()->type_);
+ recursiveNewUserStateType(parent_type, new_typename, simgrid::instr::Container::get_root()->get_type());
}
static void recursiveNewValueForUserStateType(const std::string& type_name, const char* val, const std::string& color,
void instr_new_value_for_user_state_type(const std::string& type_name, const char* value, const std::string& color)
{
- recursiveNewValueForUserStateType(type_name, value, color, simgrid::instr::Container::get_root()->type_);
+ recursiveNewValueForUserStateType(type_name, value, color, simgrid::instr::Container::get_root()->get_type());
}
namespace simgrid {
namespace instr {
+/** @brief Creates a file with the topology of the platform file used for the simulator.
+ *
+ * The graph topology will have the following properties: all hosts, links and routers of the platform file are mapped
+ * to graph nodes; routes are mapped to edges. The platform's zones are not represented in the output.
+ */
void platform_graph_export_graphviz(const std::string& output_filename)
{
auto* g = xbt_graph_new_graph(0, nullptr);
xbt_assert(Container::get_root() == root);
if (TRACE_smpi_is_enabled()) {
- auto* mpi = root->type_->by_name_or_create<ContainerType>("MPI");
+ auto* mpi = root->get_type()->by_name_or_create<ContainerType>("MPI");
if (not TRACE_smpi_is_grouped())
mpi->by_name_or_create<StateType>("MPI_STATE");
- root->type_->by_name_or_create("MPI_LINK", mpi, mpi);
- root->type_->by_name_or_create("MIGRATE_LINK", mpi, mpi);
+ root->get_type()->by_name_or_create("MPI_LINK", mpi, mpi);
+ root->get_type()->by_name_or_create("MIGRATE_LINK", mpi, mpi);
mpi->by_name_or_create<StateType>("MIGRATE_STATE");
}
auto* container = new Container(link.get_name(), "LINK", currentContainer.back());
if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_link())) {
- VariableType* bandwidth = container->type_->by_name_or_create("bandwidth", "");
+ VariableType* bandwidth = container->get_type()->by_name_or_create("bandwidth", "");
bandwidth->set_calling_container(container);
bandwidth->set_event(0, link.get_bandwidth());
- VariableType* latency = container->type_->by_name_or_create("latency", "");
+ VariableType* latency = container->get_type()->by_name_or_create("latency", "");
latency->set_calling_container(container);
latency->set_event(0, link.get_latency());
}
if (TRACE_uncategorized()) {
- container->type_->by_name_or_create("bandwidth_used", "0.5 0.5 0.5");
+ container->get_type()->by_name_or_create("bandwidth_used", "0.5 0.5 0.5");
}
}
static void on_host_creation(s4u::Host const& host)
{
+ if (Container::by_name_or_null(host.get_name())) // This host already exists, do nothing
+ return;
+
Container* container = new HostContainer(host, currentContainer.back());
const Container* root = Container::get_root();
if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_speed())) {
- VariableType* speed = container->type_->by_name_or_create("speed", "");
+ VariableType* speed = container->get_type()->by_name_or_create("speed", "");
speed->set_calling_container(container);
speed->set_event(0, host.get_speed());
- VariableType* cores = container->type_->by_name_or_create("core_count", "");
+ VariableType* cores = container->get_type()->by_name_or_create("core_count", "");
cores->set_calling_container(container);
cores->set_event(0, host.get_core_count());
}
if (TRACE_uncategorized())
- container->type_->by_name_or_create("speed_used", "0.5 0.5 0.5");
+ container->get_type()->by_name_or_create("speed_used", "0.5 0.5 0.5");
if (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()) {
- auto* mpi = container->type_->by_name_or_create<ContainerType>("MPI");
+ auto* mpi = container->get_type()->by_name_or_create<ContainerType>("MPI");
mpi->by_name_or_create<StateType>("MPI_STATE");
- root->type_->by_name_or_create("MIGRATE_LINK", mpi, mpi);
+ root->get_type()->by_name_or_create("MIGRATE_LINK", mpi, mpi);
mpi->by_name_or_create<StateType>("MIGRATE_STATE");
}
}
auto n = static_cast<unsigned>(action.get_variable()->get_number_of_constraint());
for (unsigned i = 0; i < n; i++) {
- double value = action.get_variable()->get_value() * action.get_variable()->get_constraint_weight(i);
+ double value = action.get_rate() * action.get_variable()->get_constraint_weight(i);
/* Beware of composite actions: ptasks put links and cpus together. Extra pb: we cannot dynamic_cast from void* */
kernel::resource::Resource* resource = action.get_variable()->get_constraint(i)->get_id();
- const kernel::resource::Cpu* cpu = dynamic_cast<kernel::resource::Cpu*>(resource);
+ const kernel::resource::CpuImpl* cpu = dynamic_cast<kernel::resource::CpuImpl*>(resource);
if (cpu != nullptr)
resource_set_utilization("HOST", "speed_used", cpu->get_cname(), action.get_category(), value,
- action.get_last_update(), SIMIX_get_clock() - action.get_last_update());
+ action.get_last_update(), simgrid_get_clock() - action.get_last_update());
- const kernel::resource::LinkImpl* link = dynamic_cast<kernel::resource::LinkImpl*>(resource);
+ const kernel::resource::StandardLinkImpl* link = dynamic_cast<kernel::resource::StandardLinkImpl*>(resource);
if (link != nullptr)
resource_set_utilization("LINK", "bandwidth_used", link->get_cname(), action.get_category(), value,
- action.get_last_update(), SIMIX_get_clock() - action.get_last_update());
+ action.get_last_update(), simgrid_get_clock() - action.get_last_update());
}
}
std::string container_name = instr_pid(actor);
container->create_child(container_name, "ACTOR");
- auto* actor_type = container->type_->by_name_or_create<ContainerType>("ACTOR");
+ auto* actor_type = container->get_type()->by_name_or_create<ContainerType>("ACTOR");
auto* state = actor_type->by_name_or_create<StateType>("ACTOR_STATE");
state->add_entity_value("suspend", "1 0 1");
state->add_entity_value("sleep", "1 1 0");
state->add_entity_value("receive", "1 0 0");
state->add_entity_value("send", "0 0 1");
state->add_entity_value("execute", "0 1 1");
- root->type_->by_name_or_create("ACTOR_LINK", actor_type, actor_type);
+ root->get_type()->by_name_or_create("ACTOR_LINK", actor_type, actor_type);
actor.on_exit([container_name](bool failed) {
if (failed)
{
const Container* container = new HostContainer(host, currentContainer.back());
const Container* root = Container::get_root();
- auto* vm = container->type_->by_name_or_create<ContainerType>("VM");
+ auto* vm = container->get_type()->by_name_or_create<ContainerType>("VM");
auto* state = vm->by_name_or_create<StateType>("VM_STATE");
state->add_entity_value("suspend", "1 0 1");
state->add_entity_value("sleep", "1 1 0");
state->add_entity_value("receive", "1 0 0");
state->add_entity_value("send", "0 0 1");
state->add_entity_value("execute", "0 1 1");
- root->type_->by_name_or_create("VM_LINK", vm, vm);
- root->type_->by_name_or_create("VM_ACTOR_LINK", vm, vm);
+ root->get_type()->by_name_or_create("VM_LINK", vm, vm);
+ root->get_type()->by_name_or_create("VM_ACTOR_LINK", vm, vm);
}
void define_callbacks()
// always need the callbacks to zones (we need only the root zone), to create the rootContainer and the rootType
// properly
if (TRACE_needs_platform()) {
- s4u::Engine::on_platform_created.connect(on_platform_created);
- s4u::Host::on_creation.connect(on_host_creation);
- s4u::Host::on_speed_change.connect([](s4u::Host const& host) {
+ s4u::Engine::on_platform_created_cb(on_platform_created);
+ s4u::Host::on_creation_cb(on_host_creation);
+ s4u::Host::on_speed_change_cb([](s4u::Host const& host) {
Container::by_name(host.get_name())
->get_variable("speed")
- ->set_event(surf_get_clock(), host.get_core_count() * host.get_available_speed());
+ ->set_event(simgrid_get_clock(), host.get_core_count() * host.get_available_speed());
});
- s4u::Link::on_creation.connect(on_link_creation);
- s4u::Link::on_bandwidth_change.connect([](s4u::Link const& link) {
+ s4u::Link::on_creation_cb(on_link_creation);
+ s4u::Link::on_bandwidth_change_cb([](s4u::Link const& link) {
Container::by_name(link.get_name())
->get_variable("bandwidth")
- ->set_event(surf_get_clock(), sg_bandwidth_factor * link.get_bandwidth());
+ ->set_event(simgrid_get_clock(), sg_bandwidth_factor * link.get_bandwidth());
});
- s4u::NetZone::on_seal.connect([](s4u::NetZone const& /*netzone*/) { currentContainer.pop_back(); });
+ s4u::NetZone::on_seal_cb([](s4u::NetZone const& /*netzone*/) { currentContainer.pop_back(); });
kernel::routing::NetPoint::on_creation.connect([](kernel::routing::NetPoint const& netpoint) {
if (netpoint.is_router())
new RouterContainer(netpoint.get_name(), currentContainer.back());
});
}
- s4u::NetZone::on_creation.connect(on_netzone_creation);
+ s4u::NetZone::on_creation_cb(on_netzone_creation);
kernel::resource::CpuAction::on_state_change.connect(on_action_state_change);
- s4u::Link::on_communication_state_change.connect(on_action_state_change);
+ s4u::Link::on_communication_state_change_cb(on_action_state_change);
if (TRACE_actor_is_enabled()) {
- s4u::Actor::on_creation.connect(on_actor_creation);
- s4u::Actor::on_destruction.connect([](s4u::Actor const& actor) {
+ s4u::Actor::on_creation_cb(on_actor_creation);
+ s4u::Actor::on_destruction_cb([](s4u::Actor const& actor) {
auto container = Container::by_name_or_null(instr_pid(actor));
if (container != nullptr)
container->remove_from_parent();
});
- s4u::Actor::on_suspend.connect([](s4u::Actor const& actor) {
+ s4u::Actor::on_suspend_cb([](s4u::Actor const& actor) {
Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("suspend");
});
- s4u::Actor::on_resume.connect(
+ s4u::Actor::on_resume_cb(
[](s4u::Actor const& actor) { Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event(); });
- s4u::Actor::on_sleep.connect([](s4u::Actor const& actor) {
+ s4u::Actor::on_sleep_cb([](s4u::Actor const& actor) {
Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("sleep");
});
- s4u::Actor::on_wake_up.connect(
+ s4u::Actor::on_wake_up_cb(
[](s4u::Actor const& actor) { Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event(); });
- s4u::Exec::on_start.connect([](s4u::Exec const&) {
+ s4u::Exec::on_start_cb([](s4u::Exec const&) {
Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->push_event("execute");
});
- s4u::Exec::on_completion.connect([](s4u::Exec const&) {
+ s4u::Activity::on_completion_cb([](const s4u::Activity&) {
Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->pop_event();
});
- s4u::Comm::on_start.connect([](s4u::Comm const&, bool is_sender) {
- Container::by_name(instr_pid(*s4u::Actor::self()))
- ->get_state("ACTOR_STATE")
- ->push_event(is_sender ? "send" : "receive");
+ s4u::Comm::on_send_cb([](s4u::Comm const&) {
+ Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->push_event("send");
});
- s4u::Comm::on_completion.connect([](s4u::Comm const&) {
- Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->pop_event();
+ s4u::Comm::on_recv_cb([](s4u::Comm const&) {
+ Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->push_event("receive");
});
- s4u::Actor::on_host_change.connect(on_actor_host_change);
+ s4u::Actor::on_host_change_cb(on_actor_host_change);
}
if (TRACE_smpi_is_enabled() && TRACE_smpi_is_computing()) {
- s4u::Exec::on_start.connect([](s4u::Exec const& exec) {
+ s4u::Exec::on_start_cb([](s4u::Exec const& exec) {
Container::by_name(std::string("rank-") + std::to_string(s4u::Actor::self()->get_pid()))
->get_state("MPI_STATE")
->push_event("computing", new CpuTIData("compute", exec.get_cost()));
});
- s4u::Exec::on_completion.connect([](s4u::Exec const&) {
+ s4u::Activity::on_completion_cb([](const s4u::Activity&) {
Container::by_name(std::string("rank-") + std::to_string(s4u::Actor::self()->get_pid()))
->get_state("MPI_STATE")
->pop_event();
}
if (TRACE_vm_is_enabled()) {
- s4u::Host::on_creation.connect(on_vm_creation);
- s4u::VirtualMachine::on_start.connect([](s4u::VirtualMachine const& vm) {
+ s4u::Host::on_creation_cb(on_vm_creation);
+ s4u::VirtualMachine::on_start_cb([](s4u::VirtualMachine const& vm) {
Container::by_name(vm.get_name())->get_state("VM_STATE")->push_event("start");
});
- s4u::VirtualMachine::on_started.connect(
+ s4u::VirtualMachine::on_started_cb(
[](s4u::VirtualMachine const& vm) { Container::by_name(vm.get_name())->get_state("VM_STATE")->pop_event(); });
- s4u::VirtualMachine::on_suspend.connect([](s4u::VirtualMachine const& vm) {
+ s4u::VirtualMachine::on_suspend_cb([](s4u::VirtualMachine const& vm) {
Container::by_name(vm.get_name())->get_state("VM_STATE")->push_event("suspend");
});
- s4u::VirtualMachine::on_resume.connect(
+ s4u::VirtualMachine::on_resume_cb(
[](s4u::VirtualMachine const& vm) { Container::by_name(vm.get_name())->get_state("VM_STATE")->pop_event(); });
- s4u::Host::on_destruction.connect(
+ s4u::Host::on_destruction_cb(
[](s4u::Host const& host) { Container::by_name(host.get_name())->remove_from_parent(); });
}
}