-/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2019. 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 "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"
if (not netzone->get_children().empty()) {
// bottom-up recursion
for (auto const& nz_son : netzone->get_children()) {
- container_t child_container = container->children_.at(nz_son->get_cname());
+ container_t child_container = container->children_.at(nz_son->get_name());
recursiveGraphExtraction(nz_son, child_container, 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) {
simgrid::instr::NetZoneContainer* root = new simgrid::instr::NetZoneContainer(id, 0, nullptr);
+ xbt_assert(simgrid::instr::Container::get_root() == root);
if (TRACE_smpi_is_enabled()) {
simgrid::instr::ContainerType* mpi = root->type_->by_name_or_create<simgrid::instr::ContainerType>("MPI");
}
}
-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();
if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_speed())) {
- simgrid::instr::VariableType* power = container->type_->by_name_or_create("power", "");
- power->set_calling_container(container);
- power->set_event(0, host.getSpeed());
+ simgrid::instr::VariableType* speed = container->type_->by_name_or_create("speed", "");
+ speed->set_calling_container(container);
+ speed->set_event(0, host.get_speed());
+
+ simgrid::instr::VariableType* cores = container->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("power_used", "0.5 0.5 0.5");
+ container->type_->by_name_or_create("speed_used", "0.5 0.5 0.5");
if (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()) {
simgrid::instr::ContainerType* mpi = container->type_->by_name_or_create<simgrid::instr::ContainerType>("MPI");
}
}
-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_cname())
- ->get_variable("power")
+ 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_cpu_action_on_state_change(simgrid::surf::CpuAction* action)
-{
- simgrid::surf::Cpu* cpu = static_cast<simgrid::surf::Cpu*>(action->get_variable()->get_constraint(0)->get_id());
- TRACE_surf_resource_set_utilization("HOST", "power_used", cpu->get_cname(), action->get_category(),
- action->get_variable()->get_value(), action->get_last_update(),
- SIMIX_get_clock() - action->get_last_update());
-}
-
-static void instr_link_on_communication_state_change(simgrid::kernel::resource::NetworkAction* 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++) {
- simgrid::kernel::lmm::Constraint* constraint = action->get_variable()->get_constraint(i);
- simgrid::kernel::resource::LinkImpl* link = static_cast<simgrid::kernel::resource::LinkImpl*>(constraint->get_id());
- double value = action->get_variable()->get_value() * action->get_variable()->get_constraint_weight(i);
- 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());
+ 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 = action.get_variable()->get_constraint(i)->get_id();
+ 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());
+
+ 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());
}
}
-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_cname())
+ 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_cname(), currentContainer.back());
+ if (netpoint.is_router())
+ new simgrid::instr::RouterContainer(netpoint.get_name(), currentContainer.back());
}
static void instr_on_platform_created()
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());
+ container_t 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");
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("task_execute", "0 1 1");
+ state->add_entity_value("execute", "0 1 1");
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);
- actor->on_exit(
- [](int status, void* actor) {
- if (status == SMX_EXIT_FAILURE)
- // kill means that this actor no longer exists, let's destroy it
- simgrid::instr::Container::by_name(instr_pid(static_cast<simgrid::s4u::Actor*>(actor)))->remove_from_parent();
- },
- actor->get_impl());
+ 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_migration_start(simgrid::s4u::Actor const& actor)
{
// start link
- container_t container = simgrid::instr::Container::by_name(instr_pid(actor.get()));
+ container_t container = simgrid::instr::Container::by_name(instr_pid(actor));
simgrid::instr::Container::get_root()->get_link("ACTOR_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)
+static void instr_actor_on_migration_end(simgrid::s4u::Actor const& 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));
+ ->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();
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("task_execute", "0 1 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);
}
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::kernel::routing::NetPoint::onCreation.connect(instr_netpoint_on_creation);
+ 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_cpu_action_on_state_change);
- simgrid::s4u::Link::on_communication_state_change.connect(instr_link_on_communication_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_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_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_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_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_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_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_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_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::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::Actor const& actor) {
+ simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("execute");
+ });
+ simgrid::s4u::Exec::on_completion.connect([](simgrid::s4u::Actor const& actor) {
+ simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event();
+ });
+ 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::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::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);
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();
+ });
}
}
/*
* user categories support
*/
-static void recursiveNewVariableType(std::string new_typename, std::string color, simgrid::instr::Type* root)
+static void recursiveNewVariableType(const std::string& new_typename, const std::string& color,
+ simgrid::instr::Type* root)
{
if (root->get_name() == "HOST" || root->get_name() == "VM")
root->by_name_or_create(std::string("p") + new_typename, color);
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());
}
}
-void instr_new_variable_type(std::string new_typename, std::string color)
+void instr_new_variable_type(const std::string& new_typename, const std::string& color)
{
recursiveNewVariableType(new_typename, color, simgrid::instr::Container::get_root()->type_);
}
-static void recursiveNewUserVariableType(std::string father_type, std::string new_typename, std::string color,
- simgrid::instr::Type* root)
+static void recursiveNewUserVariableType(const std::string& father_type, const std::string& new_typename,
+ const std::string& color, simgrid::instr::Type* root)
{
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(std::string father_type, std::string new_typename, std::string color)
+void instr_new_user_variable_type(const std::string& father_type, const std::string& new_typename,
+ const std::string& color)
{
recursiveNewUserVariableType(father_type, new_typename, color, simgrid::instr::Container::get_root()->type_);
}
-static void recursiveNewUserStateType(std::string father_type, std::string new_typename, simgrid::instr::Type* root)
+static void recursiveNewUserStateType(const std::string& father_type, const std::string& new_typename,
+ simgrid::instr::Type* root)
{
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(std::string father_type, std::string new_typename)
+void instr_new_user_state_type(const std::string& father_type, const std::string& new_typename)
{
recursiveNewUserStateType(father_type, new_typename, simgrid::instr::Container::get_root()->type_);
}
-static void recursiveNewValueForUserStateType(std::string type_name, const char* val, std::string color,
+static void recursiveNewValueForUserStateType(const std::string& type_name, const char* val, const std::string& color,
simgrid::instr::Type* root)
{
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(std::string type_name, const char* value, 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_);
}
if (not netzone->get_children().empty()) {
// bottom-up recursion
for (auto const& netzone_child : netzone->get_children()) {
- container_t child_container = container->children_.at(netzone_child->get_cname());
+ container_t child_container = container->children_.at(netzone_child->get_name());
recursiveXBTGraphExtraction(graph, nodes, edges, netzone_child, child_container);
}
}
