-/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2020. 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. */
static std::vector<simgrid::instr::NetZoneContainer*> currentContainer; /* push and pop, used only in creation */
-static const char* instr_node_name(xbt_node_t node)
+std::string instr_pid(simgrid::s4u::Actor const& proc)
+{
+ return std::string(proc.get_name()) + "-" + std::to_string(proc.get_pid());
+}
+
+static const char* instr_node_name(const s_xbt_node_t* node)
{
return static_cast<char*>(xbt_graph_node_get_data(node));
}
-static container_t lowestCommonAncestor(container_t a1, container_t a2)
+static container_t lowestCommonAncestor(const simgrid::instr::Container* a1, 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_)
int j = ancestors_a2.size() - 1;
while (i >= 0 && j >= 0) {
container_t a1p = ancestors_a1.at(i);
- container_t a2p = ancestors_a2.at(j);
+ const simgrid::instr::Container* a2p = ancestors_a2.at(j);
if (a1p == a2p) {
p = a1p;
} else {
simgrid::instr::LinkType* link = father->type_->by_name_or_create(link_typename, src->type_, dst->type_);
link->set_calling_container(father);
- // register EDGE types for triva configuration
- trivaEdgeTypes.insert(link->get_name());
-
// create the link
static long long counter = 0;
XBT_DEBUG(" linkContainers %s <-> %s", src->get_cname(), dst->get_cname());
}
-static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t container,
+static void recursiveGraphExtraction(const simgrid::s4u::NetZone* netzone, container_t container,
std::set<std::string>* filter)
{
if (not TRACE_platform_topology()) {
}
xbt_graph_t graph = xbt_graph_new_graph(0, nullptr);
- 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>;
+ 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>();
netzone->get_impl()->get_graph(graph, nodes, edges);
for (auto elm : *edges) {
- xbt_edge_t edge = elm.second;
+ const xbt_edge* edge = elm.second;
linkContainers(simgrid::instr::Container::by_name(static_cast<const char*>(edge->src->data)),
simgrid::instr::Container::by_name(static_cast<const char*>(edge->dst->data)), filter);
}
/*
* Callbacks
*/
-static void instr_netzone_on_creation(simgrid::s4u::NetZone& netzone)
+static void instr_netzone_on_creation(simgrid::s4u::NetZone const& netzone)
{
std::string id = netzone.get_name();
if (simgrid::instr::Container::get_root() == nullptr) {
}
}
-static void instr_link_on_creation(simgrid::s4u::Link& link)
+static void instr_link_on_creation(simgrid::s4u::Link const& link)
{
if (currentContainer.empty()) // No ongoing parsing. Are you creating the loopback?
return;
}
}
-static void instr_host_on_creation(simgrid::s4u::Host& host)
+static void instr_host_on_creation(simgrid::s4u::Host const& host)
{
- container_t container = new simgrid::instr::HostContainer(host, currentContainer.back());
- container_t root = simgrid::instr::Container::get_root();
+ simgrid::instr::Container* container = new simgrid::instr::HostContainer(host, currentContainer.back());
+ const simgrid::instr::Container* root = simgrid::instr::Container::get_root();
if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_speed())) {
simgrid::instr::VariableType* speed = container->type_->by_name_or_create("speed", "");
}
}
-static void instr_host_on_speed_change(simgrid::s4u::Host& host)
+static void instr_host_on_speed_change(simgrid::s4u::Host const& host)
{
simgrid::instr::Container::by_name(host.get_name())
->get_variable("speed")
->set_event(surf_get_clock(), host.get_core_count() * host.get_available_speed());
}
-static void instr_action_on_state_change(simgrid::kernel::resource::Action* action,
+static void instr_action_on_state_change(simgrid::kernel::resource::Action const& action,
simgrid::kernel::resource::Action::State /* previous */)
{
- int n = action->get_variable()->get_number_of_constraint();
+ int n = action.get_variable()->get_number_of_constraint();
for (int i = 0; i < n; i++) {
- double value = action->get_variable()->get_value() * action->get_variable()->get_constraint_weight(i);
+ double value = action.get_variable()->get_value() * 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* */
- simgrid::kernel::resource::Resource* resource =
- static_cast<simgrid::kernel::resource::Resource*>(action->get_variable()->get_constraint(i)->get_id());
- simgrid::surf::Cpu* cpu = dynamic_cast<simgrid::surf::Cpu*>(resource);
+ simgrid::kernel::resource::Resource* resource = action.get_variable()->get_constraint(i)->get_id();
+ const simgrid::kernel::resource::Cpu* cpu = dynamic_cast<simgrid::kernel::resource::Cpu*>(resource);
if (cpu != nullptr)
- TRACE_surf_resource_set_utilization("HOST", "speed_used", cpu->get_cname(), action->get_category(), value,
- action->get_last_update(), SIMIX_get_clock() - action->get_last_update());
+ TRACE_surf_resource_set_utilization("HOST", "speed_used", cpu->get_cname(), action.get_category(), value,
+ action.get_last_update(), SIMIX_get_clock() - action.get_last_update());
- simgrid::kernel::resource::LinkImpl* link = dynamic_cast<simgrid::kernel::resource::LinkImpl*>(resource);
+ const simgrid::kernel::resource::LinkImpl* link = dynamic_cast<simgrid::kernel::resource::LinkImpl*>(resource);
if (link != nullptr)
- TRACE_surf_resource_set_utilization("LINK", "bandwidth_used", link->get_cname(), action->get_category(), value,
- action->get_last_update(), SIMIX_get_clock() - action->get_last_update());
+ TRACE_surf_resource_set_utilization("LINK", "bandwidth_used", link->get_cname(), action.get_category(), value,
+ action.get_last_update(), SIMIX_get_clock() - action.get_last_update());
}
}
-static void instr_link_on_bandwidth_change(simgrid::s4u::Link& link)
+static void instr_link_on_bandwidth_change(simgrid::s4u::Link const& link)
{
simgrid::instr::Container::by_name(link.get_name())
->get_variable("bandwidth")
->set_event(surf_get_clock(), sg_bandwidth_factor * link.get_bandwidth());
}
-static void instr_netpoint_on_creation(simgrid::kernel::routing::NetPoint* netpoint)
+static void instr_netpoint_on_creation(simgrid::kernel::routing::NetPoint const& netpoint)
{
- if (netpoint->is_router())
- new simgrid::instr::RouterContainer(netpoint->get_name(), currentContainer.back());
+ if (netpoint.is_router())
+ new simgrid::instr::RouterContainer(netpoint.get_name(), currentContainer.back());
}
static void instr_on_platform_created()
{
currentContainer.clear();
- std::set<std::string>* filter = new std::set<std::string>;
+ std::set<std::string>* filter = new std::set<std::string>();
XBT_DEBUG("Starting graph extraction.");
recursiveGraphExtraction(simgrid::s4u::Engine::get_instance()->get_netzone_root(),
simgrid::instr::Container::get_root(), filter);
TRACE_paje_dump_buffer(true);
}
-static void instr_actor_on_creation(simgrid::s4u::ActorPtr actor)
+static void instr_actor_on_creation(simgrid::s4u::Actor const& actor)
{
- container_t root = simgrid::instr::Container::get_root();
- container_t container = simgrid::instr::Container::by_name(actor->get_host()->get_name());
+ const simgrid::instr::Container* root = simgrid::instr::Container::get_root();
+ simgrid::instr::Container* container = simgrid::instr::Container::by_name(actor.get_host()->get_name());
- container->create_child(instr_pid(actor.get()), "ACTOR");
+ container->create_child(instr_pid(actor), "ACTOR");
simgrid::instr::ContainerType* actor_type =
container->type_->by_name_or_create<simgrid::instr::ContainerType>("ACTOR");
simgrid::instr::StateType* state = actor_type->by_name_or_create<simgrid::instr::StateType>("ACTOR_STATE");
root->type_->by_name_or_create("ACTOR_LINK", actor_type, actor_type);
root->type_->by_name_or_create("ACTOR_TASK_LINK", actor_type, actor_type);
- std::string container_name = instr_pid(actor.get());
- actor->on_exit([container_name](bool failed) {
+ std::string container_name = instr_pid(actor);
+ actor.on_exit([container_name](bool failed) {
if (failed)
// kill means that this actor no longer exists, let's destroy it
simgrid::instr::Container::by_name(container_name)->remove_from_parent();
});
}
-static long long int counter = 0;
-
-static void instr_actor_on_migration_start(simgrid::s4u::ActorPtr actor)
+static void instr_actor_on_host_change(simgrid::s4u::Actor const& actor,
+ simgrid::s4u::Host const& /*previous_location*/)
{
- // start link
- container_t container = simgrid::instr::Container::by_name(instr_pid(actor.get()));
- simgrid::instr::Container::get_root()->get_link("ACTOR_LINK")->start_event(container, "M", std::to_string(counter));
+ static long long int counter = 0;
+ container_t container = simgrid::instr::Container::by_name(instr_pid(actor));
+ simgrid::instr::LinkType* link = simgrid::instr::Container::get_root()->get_link("ACTOR_LINK");
+ // start link
+ link->start_event(container, "M", std::to_string(counter));
// destroy existing container of this process
container->remove_from_parent();
-}
-
-static void instr_actor_on_migration_end(simgrid::s4u::ActorPtr actor)
-{
// create new container on the new_host location
- simgrid::instr::Container::by_name(actor->get_host()->get_name())->create_child(instr_pid(actor.get()), "ACTOR");
+ simgrid::instr::Container::by_name(actor.get_host()->get_name())->create_child(instr_pid(actor), "ACTOR");
// end link
- simgrid::instr::Container::get_root()
- ->get_link("ACTOR_LINK")
- ->end_event(simgrid::instr::Container::by_name(instr_pid(actor.get())), "M", std::to_string(counter));
+ link->end_event(simgrid::instr::Container::by_name(instr_pid(actor)), "M", std::to_string(counter));
counter++;
}
-static void instr_vm_on_creation(simgrid::s4u::Host& host)
+static void instr_vm_on_creation(simgrid::s4u::Host const& host)
{
- container_t container = new simgrid::instr::HostContainer(host, currentContainer.back());
- container_t root = simgrid::instr::Container::get_root();
+ const simgrid::instr::Container* container = new simgrid::instr::HostContainer(host, currentContainer.back());
+ const simgrid::instr::Container* root = simgrid::instr::Container::get_root();
simgrid::instr::ContainerType* vm = container->type_->by_name_or_create<simgrid::instr::ContainerType>("VM");
simgrid::instr::StateType* state = vm->by_name_or_create<simgrid::instr::StateType>("VM_STATE");
state->add_entity_value("suspend", "1 0 1");
// 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::on_platform_created.connect(instr_on_platform_created);
+ simgrid::s4u::Engine::on_platform_created.connect(instr_on_platform_created);
simgrid::s4u::Host::on_creation.connect(instr_host_on_creation);
simgrid::s4u::Host::on_speed_change.connect(instr_host_on_speed_change);
simgrid::s4u::Link::on_creation.connect(instr_link_on_creation);
simgrid::s4u::Link::on_bandwidth_change.connect(instr_link_on_bandwidth_change);
- simgrid::s4u::NetZone::on_seal.connect([](simgrid::s4u::NetZone& /*netzone*/) { currentContainer.pop_back(); });
+ simgrid::s4u::NetZone::on_seal.connect(
+ [](simgrid::s4u::NetZone const& /*netzone*/) { currentContainer.pop_back(); });
simgrid::kernel::routing::NetPoint::on_creation.connect(instr_netpoint_on_creation);
}
simgrid::s4u::NetZone::on_creation.connect(instr_netzone_on_creation);
- simgrid::surf::CpuAction::on_state_change.connect(instr_action_on_state_change);
+ simgrid::kernel::resource::CpuAction::on_state_change.connect(instr_action_on_state_change);
simgrid::s4u::Link::on_communication_state_change.connect(instr_action_on_state_change);
if (TRACE_actor_is_enabled()) {
simgrid::s4u::Actor::on_creation.connect(instr_actor_on_creation);
- simgrid::s4u::Actor::on_destruction.connect([](simgrid::s4u::ActorPtr actor) {
- auto container = simgrid::instr::Container::by_name_or_null(instr_pid(actor.get()));
+ simgrid::s4u::Actor::on_destruction.connect([](simgrid::s4u::Actor const& actor) {
+ auto container = simgrid::instr::Container::by_name_or_null(instr_pid(actor));
if (container != nullptr)
container->remove_from_parent();
});
- simgrid::s4u::Actor::on_suspend.connect([](simgrid::s4u::ActorPtr actor) {
- simgrid::instr::Container::by_name(instr_pid(actor.get()))->get_state("ACTOR_STATE")->push_event("suspend");
+ simgrid::s4u::Actor::on_suspend.connect([](simgrid::s4u::Actor const& actor) {
+ simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("suspend");
});
- simgrid::s4u::Actor::on_resume.connect([](simgrid::s4u::ActorPtr actor) {
- simgrid::instr::Container::by_name(instr_pid(actor.get()))->get_state("ACTOR_STATE")->pop_event();
+ simgrid::s4u::Actor::on_resume.connect([](simgrid::s4u::Actor const& actor) {
+ simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event();
});
- simgrid::s4u::Actor::on_sleep.connect([](simgrid::s4u::ActorPtr actor) {
- simgrid::instr::Container::by_name(instr_pid(actor.get()))->get_state("ACTOR_STATE")->push_event("sleep");
+ simgrid::s4u::Actor::on_sleep.connect([](simgrid::s4u::Actor const& actor) {
+ simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("sleep");
});
- simgrid::s4u::Actor::on_wake_up.connect([](simgrid::s4u::ActorPtr actor) {
- simgrid::instr::Container::by_name(instr_pid(actor.get()))->get_state("ACTOR_STATE")->pop_event();
+ simgrid::s4u::Actor::on_wake_up.connect([](simgrid::s4u::Actor const& actor) {
+ simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event();
});
- simgrid::s4u::Exec::on_start.connect([](simgrid::s4u::ActorPtr actor) {
- simgrid::instr::Container::by_name(instr_pid(actor.get()))->get_state("ACTOR_STATE")->push_event("execute");
+ simgrid::s4u::Exec::on_start.connect([](simgrid::s4u::Actor const& actor, simgrid::s4u::Exec const&) {
+ simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("execute");
});
- simgrid::s4u::Exec::on_completion.connect([](simgrid::s4u::ActorPtr actor) {
- simgrid::instr::Container::by_name(instr_pid(actor.get()))->get_state("ACTOR_STATE")->pop_event();
+ simgrid::s4u::Exec::on_completion.connect([](simgrid::s4u::Actor const& actor, simgrid::s4u::Exec const&) {
+ simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event();
});
- simgrid::s4u::Comm::on_sender_start.connect([](simgrid::s4u::ActorPtr actor) {
- simgrid::instr::Container::by_name(instr_pid(actor.get()))->get_state("ACTOR_STATE")->push_event("send");
+ simgrid::s4u::Comm::on_sender_start.connect([](simgrid::s4u::Actor const& actor) {
+ simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("send");
});
- simgrid::s4u::Comm::on_receiver_start.connect([](simgrid::s4u::ActorPtr actor) {
- simgrid::instr::Container::by_name(instr_pid(actor.get()))->get_state("ACTOR_STATE")->push_event("receive");
+ simgrid::s4u::Comm::on_receiver_start.connect([](simgrid::s4u::Actor const& actor) {
+ simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("receive");
});
- simgrid::s4u::Comm::on_completion.connect([](simgrid::s4u::ActorPtr actor) {
- simgrid::instr::Container::by_name(instr_pid(actor.get()))->get_state("ACTOR_STATE")->pop_event();
+ simgrid::s4u::Comm::on_completion.connect([](simgrid::s4u::Actor const& actor) {
+ simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event();
});
- simgrid::s4u::Actor::on_migration_start.connect(instr_actor_on_migration_start);
- simgrid::s4u::Actor::on_migration_end.connect(instr_actor_on_migration_end);
+ simgrid::s4u::Actor::on_host_change.connect(instr_actor_on_host_change);
}
if (TRACE_vm_is_enabled()) {
simgrid::s4u::Host::on_creation.connect(instr_vm_on_creation);
- simgrid::s4u::VirtualMachine::on_start.connect([](simgrid::s4u::VirtualMachine& vm) {
+ simgrid::s4u::VirtualMachine::on_start.connect([](simgrid::s4u::VirtualMachine const& vm) {
simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->push_event("start");
});
- simgrid::s4u::VirtualMachine::on_started.connect([](simgrid::s4u::VirtualMachine& vm) {
+ simgrid::s4u::VirtualMachine::on_started.connect([](simgrid::s4u::VirtualMachine const& vm) {
simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->pop_event();
});
- simgrid::s4u::VirtualMachine::on_suspend.connect([](simgrid::s4u::VirtualMachine& vm) {
+ simgrid::s4u::VirtualMachine::on_suspend.connect([](simgrid::s4u::VirtualMachine const& vm) {
simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->push_event("suspend");
});
- simgrid::s4u::VirtualMachine::on_resume.connect([](simgrid::s4u::VirtualMachine& vm) {
+ simgrid::s4u::VirtualMachine::on_resume.connect([](simgrid::s4u::VirtualMachine const& vm) {
simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->pop_event();
});
- simgrid::s4u::Host::on_destruction.connect(
- [](simgrid::s4u::Host& host) { simgrid::instr::Container::by_name(host.get_name())->remove_from_parent(); });
+ simgrid::s4u::Host::on_destruction.connect([](simgrid::s4u::Host const& host) {
+ simgrid::instr::Container::by_name(host.get_name())->remove_from_parent();
+ });
}
}
/*
if (root->get_name() == "LINK")
root->by_name_or_create(std::string("b") + new_typename, color);
- for (auto elm : root->children_) {
- recursiveNewVariableType(new_typename, color, elm.second);
+ for (auto const& elm : root->children_) {
+ recursiveNewVariableType(new_typename, color, elm.second.get());
}
}
if (root->get_name() == father_type) {
root->by_name_or_create(new_typename, color);
}
- for (auto elm : root->children_)
- recursiveNewUserVariableType(father_type, new_typename, color, elm.second);
+ for (auto const& elm : root->children_)
+ recursiveNewUserVariableType(father_type, new_typename, color, elm.second.get());
}
void instr_new_user_variable_type(const std::string& father_type, const std::string& new_typename,
if (root->get_name() == father_type)
root->by_name_or_create<simgrid::instr::StateType>(new_typename);
- for (auto elm : root->children_)
- recursiveNewUserStateType(father_type, new_typename, elm.second);
+ for (auto const& elm : root->children_)
+ recursiveNewUserStateType(father_type, new_typename, elm.second.get());
}
void instr_new_user_state_type(const std::string& father_type, const std::string& new_typename)
if (root->get_name() == type_name)
static_cast<simgrid::instr::StateType*>(root)->add_entity_value(val, color);
- for (auto elm : root->children_)
- recursiveNewValueForUserStateType(type_name, val, color, elm.second);
+ for (auto const& elm : root->children_)
+ recursiveNewValueForUserStateType(type_name, val, color, elm.second.get());
}
void instr_new_value_for_user_state_type(const std::string& type_name, const char* value, const std::string& color)
#define GRAPHICATOR_SUPPORT_FUNCTIONS
-static void recursiveXBTGraphExtraction(xbt_graph_t graph, std::map<std::string, xbt_node_t>* nodes,
- std::map<std::string, xbt_edge_t>* edges, sg_netzone_t netzone,
+static void recursiveXBTGraphExtraction(const s_xbt_graph_t* graph, std::map<std::string, xbt_node_t>* nodes,
+ std::map<std::string, xbt_edge_t>* edges, const_sg_netzone_t netzone,
container_t container)
{
if (not netzone->get_children().empty()) {
xbt_graph_t instr_routing_platform_graph()
{
xbt_graph_t ret = xbt_graph_new_graph(0, nullptr);
- 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>;
+ 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::get_instance()->get_netzone_root(),
simgrid::instr::Container::get_root());
delete nodes;
return ret;
}
-void instr_routing_platform_graph_export_graphviz(xbt_graph_t g, const char* filename)
+void instr_routing_platform_graph_export_graphviz(const s_xbt_graph_t* g, const char* filename)
{
unsigned int cursor = 0;
xbt_node_t node = nullptr;
