X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d9283f70767d924231914c13674153d4b90a168..9b60e270c5fe98fb6c528164aa9c6e4e6045f7e0:/src/instr/instr_platform.cpp diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp index 329dedde58..a9ba36935f 100644 --- a/src/instr/instr_platform.cpp +++ b/src/instr/instr_platform.cpp @@ -13,6 +13,7 @@ #include "simgrid/s4u/VirtualMachine.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" +#include "src/surf/surf_interface.hpp" #include "src/surf/xml/platf_private.hpp" #include "surf/surf.hpp" #include "xbt/graph.h" @@ -101,7 +102,7 @@ static void linkContainers(container_t src, container_t dst, std::settype_->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->setCallingContainer(father); + link->set_calling_container(father); // register EDGE types for triva configuration trivaEdgeTypes.insert(link->get_name()); @@ -112,8 +113,8 @@ static void linkContainers(container_t src, container_t dst, std::setstartEvent(src, "topology", key); - link->endEvent(dst, "topology", key); + link->start_event(src, "topology", key); + link->end_event(dst, "topology", key); XBT_DEBUG(" linkContainers %s <-> %s", src->get_cname(), dst->get_cname()); } @@ -126,9 +127,9 @@ static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t return; } XBT_DEBUG("Graph extraction for NetZone = %s", netzone->get_cname()); - if (not netzone->getChildren()->empty()) { + if (not netzone->get_children().empty()) { // bottom-up recursion - for (auto const& nz_son : *netzone->getChildren()) { + for (auto const& nz_son : netzone->get_children()) { container_t child_container = container->children_.at(nz_son->get_cname()); recursiveGraphExtraction(nz_son, child_container, filter); } @@ -138,11 +139,11 @@ static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t std::map* nodes = new std::map; std::map* edges = new std::map; - static_cast(netzone)->get_graph(graph, nodes, edges); + netzone->get_impl()->get_graph(graph, nodes, edges); for (auto elm : *edges) { xbt_edge_t edge = elm.second; - linkContainers(simgrid::instr::Container::byName(static_cast(edge->src->data)), - simgrid::instr::Container::byName(static_cast(edge->dst->data)), filter); + linkContainers(simgrid::instr::Container::by_name(static_cast(edge->src->data)), + simgrid::instr::Container::by_name(static_cast(edge->dst->data)), filter); } delete nodes; delete edges; @@ -155,7 +156,7 @@ static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t static void instr_netzone_on_creation(simgrid::s4u::NetZone& netzone) { std::string id = netzone.get_name(); - if (simgrid::instr::Container::getRoot() == nullptr) { + if (simgrid::instr::Container::get_root() == nullptr) { simgrid::instr::NetZoneContainer* root = new simgrid::instr::NetZoneContainer(id, 0, nullptr); if (TRACE_smpi_is_enabled()) { @@ -181,13 +182,6 @@ static void instr_netzone_on_creation(simgrid::s4u::NetZone& netzone) } } -static void instr_netzone_on_seal(simgrid::s4u::NetZone& /*netzone*/) -{ - if (TRACE_needs_platform()) { - currentContainer.pop_back(); - } -} - static void instr_link_on_creation(simgrid::s4u::Link& link) { if (currentContainer.empty()) // No ongoing parsing. Are you creating the loopback? @@ -197,11 +191,11 @@ static void instr_link_on_creation(simgrid::s4u::Link& link) if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_link())) { simgrid::instr::VariableType* bandwidth = container->type_->by_name_or_create("bandwidth", ""); - bandwidth->setCallingContainer(container); - bandwidth->setEvent(0, link.bandwidth()); + bandwidth->set_calling_container(container); + bandwidth->set_event(0, link.get_bandwidth()); simgrid::instr::VariableType* latency = container->type_->by_name_or_create("latency", ""); - latency->setCallingContainer(container); - latency->setEvent(0, link.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"); @@ -211,12 +205,12 @@ static void instr_link_on_creation(simgrid::s4u::Link& link) static void instr_host_on_creation(simgrid::s4u::Host& host) { container_t container = new simgrid::instr::HostContainer(host, currentContainer.back()); - container_t root = simgrid::instr::Container::getRoot(); + 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->setCallingContainer(container); - power->setEvent(0, host.getSpeed()); + power->set_calling_container(container); + power->set_event(0, host.getSpeed()); } if (TRACE_uncategorized()) @@ -231,8 +225,14 @@ static void instr_host_on_creation(simgrid::s4u::Host& host) } } -static void instr_cpu_action_on_state_change(simgrid::surf::CpuAction* action, - simgrid::kernel::resource::Action::State /* previous */) +static void instr_host_on_speed_change(simgrid::s4u::Host& host) +{ + simgrid::instr::Container::by_name(host.get_cname()) + ->get_variable("power") + ->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(action->get_variable()->get_constraint(0)->get_id()); TRACE_surf_resource_set_utilization("HOST", "power_used", cpu->get_cname(), action->get_category(), @@ -240,9 +240,28 @@ static void instr_cpu_action_on_state_change(simgrid::surf::CpuAction* action, SIMIX_get_clock() - action->get_last_update()); } +static void instr_link_on_communication_state_change(simgrid::kernel::resource::NetworkAction* action) +{ + 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(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()); + } +} +static void instr_link_on_bandwidth_change(simgrid::s4u::Link& link) +{ + simgrid::instr::Container::by_name(link.get_cname()) + ->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) { - if (netpoint->is_router() && TRACE_needs_platform() && TRACE_is_enabled()) + if (netpoint->is_router()) new simgrid::instr::RouterContainer(netpoint->get_cname(), currentContainer.back()); } @@ -252,7 +271,7 @@ static void instr_on_platform_created() std::set* filter = new std::set; XBT_DEBUG("Starting graph extraction."); recursiveGraphExtraction(simgrid::s4u::Engine::get_instance()->get_netzone_root(), - simgrid::instr::Container::getRoot(), filter); + simgrid::instr::Container::get_root(), filter); XBT_DEBUG("Graph extraction finished."); delete filter; TRACE_paje_dump_buffer(true); @@ -260,30 +279,28 @@ static void instr_on_platform_created() static void instr_actor_on_creation(simgrid::s4u::ActorPtr actor) { - container_t root = simgrid::instr::Container::getRoot(); - container_t container = simgrid::instr::Container::byName(actor->get_host()->get_name()); + container_t root = simgrid::instr::Container::get_root(); + container_t container = simgrid::instr::Container::by_name(actor->get_host()->get_name()); - container->createChild(instr_pid(actor.get()), "ACTOR"); + container->create_child(instr_pid(actor.get()), "ACTOR"); simgrid::instr::ContainerType* actor_type = container->type_->by_name_or_create("ACTOR"); simgrid::instr::StateType* state = actor_type->by_name_or_create("ACTOR_STATE"); - state->addEntityValue("suspend", "1 0 1"); - state->addEntityValue("sleep", "1 1 0"); - state->addEntityValue("receive", "1 0 0"); - state->addEntityValue("send", "0 0 1"); - state->addEntityValue("task_execute", "0 1 1"); + 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("task_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); -} -static void instr_actor_on_suspend(simgrid::s4u::ActorPtr actor) -{ - simgrid::instr::Container::byName(instr_pid(actor.get()))->getState("ACTOR_STATE")->pushEvent("suspend"); -} - -static void instr_actor_on_resume(simgrid::s4u::ActorPtr actor) -{ - simgrid::instr::Container::byName(instr_pid(actor.get()))->getState("ACTOR_STATE")->popEvent(); + 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(actor)))->remove_from_parent(); + }, + actor->get_impl()); } static long long int counter = 0; @@ -291,94 +308,91 @@ static long long int counter = 0; static void instr_actor_on_migration_start(simgrid::s4u::ActorPtr actor) { // start link - container_t container = simgrid::instr::Container::byName(instr_pid(actor.get())); - simgrid::instr::Container::getRoot()->getLink("ACTOR_LINK")->startEvent(container, "M", std::to_string(counter)); + 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)); // destroy existing container of this process - container->removeFromParent(); + 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::byName(actor->get_host()->get_name())->createChild(instr_pid(actor.get()), "ACTOR"); + simgrid::instr::Container::by_name(actor->get_host()->get_name())->create_child(instr_pid(actor.get()), "ACTOR"); // end link - simgrid::instr::Container::getRoot() - ->getLink("ACTOR_LINK") - ->endEvent(simgrid::instr::Container::byName(instr_pid(actor.get())), "M", std::to_string(counter)); + 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)); counter++; } static void instr_vm_on_creation(simgrid::s4u::Host& host) { container_t container = new simgrid::instr::HostContainer(host, currentContainer.back()); - container_t root = simgrid::instr::Container::getRoot(); + container_t root = simgrid::instr::Container::get_root(); simgrid::instr::ContainerType* vm = container->type_->by_name_or_create("VM"); simgrid::instr::StateType* state = vm->by_name_or_create("VM_STATE"); - state->addEntityValue("suspend", "1 0 1"); - state->addEntityValue("sleep", "1 1 0"); - state->addEntityValue("receive", "1 0 0"); - state->addEntityValue("send", "0 0 1"); - state->addEntityValue("task_execute", "0 1 1"); + 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("task_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); } -static void instr_vm_on_start(simgrid::s4u::VirtualMachine& vm) -{ - simgrid::instr::Container::byName(vm.get_name())->getState("VM_STATE")->pushEvent("start"); -} - -static void instr_vm_on_started(simgrid::s4u::VirtualMachine& vm) -{ - simgrid::instr::Container::byName(vm.get_name())->getState("VM_STATE")->popEvent(); -} - -static void instr_vm_on_suspend(simgrid::s4u::VirtualMachine& vm) -{ - simgrid::instr::Container::byName(vm.get_name())->getState("VM_STATE")->pushEvent("suspend"); -} - -static void instr_vm_on_resume(simgrid::s4u::VirtualMachine& vm) -{ - simgrid::instr::Container::byName(vm.get_name())->getState("VM_STATE")->popEvent(); -} - -static void instr_vm_on_destruction(simgrid::s4u::Host& host) -{ - simgrid::instr::Container::byName(host.get_name())->removeFromParent(); -} - void instr_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()) { simgrid::s4u::on_platform_created.connect(instr_on_platform_created); - simgrid::s4u::Host::onCreation.connect(instr_host_on_creation); - simgrid::s4u::Link::onCreation.connect(instr_link_on_creation); + 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::kernel::routing::NetPoint::on_creation.connect(instr_netpoint_on_creation); } - simgrid::s4u::NetZone::onCreation.connect(instr_netzone_on_creation); - simgrid::s4u::NetZone::onSeal.connect(instr_netzone_on_seal); - simgrid::kernel::routing::NetPoint::onCreation.connect(instr_netpoint_on_creation); + simgrid::s4u::NetZone::on_creation.connect(instr_netzone_on_creation); - simgrid::surf::CpuAction::onStateChange.connect(instr_cpu_action_on_state_change); + 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); if (TRACE_actor_is_enabled()) { simgrid::s4u::Actor::on_creation.connect(instr_actor_on_creation); - simgrid::s4u::Actor::on_suspend.connect(instr_actor_on_suspend); - simgrid::s4u::Actor::on_resume.connect(instr_actor_on_resume); + 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_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_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_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_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::onCreation.connect(instr_vm_on_creation); - simgrid::s4u::VirtualMachine::on_start.connect(instr_vm_on_start); - simgrid::s4u::VirtualMachine::on_started.connect(instr_vm_on_started); - simgrid::s4u::VirtualMachine::on_suspend.connect(instr_vm_on_suspend); - simgrid::s4u::VirtualMachine::on_resume.connect(instr_vm_on_resume); - simgrid::s4u::Host::onDestruction.connect(instr_vm_on_destruction); + simgrid::s4u::Host::on_creation.connect(instr_vm_on_creation); + simgrid::s4u::VirtualMachine::on_start.connect([](simgrid::s4u::VirtualMachine& 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::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->pop_event(); + }); + simgrid::s4u::VirtualMachine::on_suspend.connect([](simgrid::s4u::VirtualMachine& 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::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(); }); } } /* @@ -399,7 +413,7 @@ static void recursiveNewVariableType(std::string new_typename, std::string color void instr_new_variable_type(std::string new_typename, std::string color) { - recursiveNewVariableType(new_typename, color, simgrid::instr::Container::getRoot()->type_); + recursiveNewVariableType(new_typename, color, simgrid::instr::Container::get_root()->type_); } static void recursiveNewUserVariableType(std::string father_type, std::string new_typename, std::string color, @@ -414,7 +428,7 @@ static void recursiveNewUserVariableType(std::string father_type, std::string ne 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::Container::getRoot()->type_); + 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) @@ -428,14 +442,14 @@ static void recursiveNewUserStateType(std::string father_type, std::string new_t void instr_new_user_state_type(std::string father_type, std::string new_typename) { - recursiveNewUserStateType(father_type, new_typename, simgrid::instr::Container::getRoot()->type_); + recursiveNewUserStateType(father_type, new_typename, simgrid::instr::Container::get_root()->type_); } static void recursiveNewValueForUserStateType(std::string type_name, const char* val, std::string color, simgrid::instr::Type* root) { if (root->get_name() == type_name) - static_cast(root)->addEntityValue(val, color); + static_cast(root)->add_entity_value(val, color); for (auto elm : root->children_) recursiveNewValueForUserStateType(type_name, val, color, elm.second); @@ -443,7 +457,7 @@ static void recursiveNewValueForUserStateType(std::string type_name, const char* 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::Container::getRoot()->type_); + recursiveNewValueForUserStateType(type_name, value, color, simgrid::instr::Container::get_root()->type_); } #define GRAPHICATOR_SUPPORT_FUNCTIONS @@ -452,15 +466,15 @@ static void recursiveXBTGraphExtraction(xbt_graph_t graph, std::map* edges, sg_netzone_t netzone, container_t container) { - if (not netzone->getChildren()->empty()) { + if (not netzone->get_children().empty()) { // bottom-up recursion - for (auto const& netzone_child : *netzone->getChildren()) { + for (auto const& netzone_child : netzone->get_children()) { container_t child_container = container->children_.at(netzone_child->get_cname()); recursiveXBTGraphExtraction(graph, nodes, edges, netzone_child, child_container); } } - static_cast(netzone)->get_graph(graph, nodes, edges); + netzone->get_impl()->get_graph(graph, nodes, edges); } xbt_graph_t instr_routing_platform_graph() @@ -469,7 +483,7 @@ xbt_graph_t instr_routing_platform_graph() std::map* nodes = new std::map; std::map* edges = new std::map; recursiveXBTGraphExtraction(ret, nodes, edges, simgrid::s4u::Engine::get_instance()->get_netzone_root(), - simgrid::instr::Container::getRoot()); + simgrid::instr::Container::get_root()); delete nodes; delete edges; return ret;