X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3273ad0ab4c873a63fe6efb046ca6a9525f1f2d..0fca8a1497fff4bb22f715f851ddbea4073ad3c2:/src/instr/instr_platform.cpp diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp index d46659ef6b..f0433c4d37 100644 --- a/src/instr/instr_platform.cpp +++ b/src/instr/instr_platform.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -8,7 +8,9 @@ #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" @@ -208,13 +210,17 @@ static void instr_host_on_creation(simgrid::s4u::Host& host) 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.get_speed()); + 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("MPI"); @@ -228,7 +234,7 @@ static void instr_host_on_creation(simgrid::s4u::Host& host) static void instr_host_on_speed_change(simgrid::s4u::Host& host) { simgrid::instr::Container::by_name(host.get_cname()) - ->get_variable("power") + ->get_variable("speed") ->set_event(surf_get_clock(), host.get_core_count() * host.get_available_speed()); } @@ -245,7 +251,7 @@ static void instr_action_on_state_change(simgrid::kernel::resource::Action* acti simgrid::surf::Cpu* cpu = dynamic_cast(resource); if (cpu != nullptr) - TRACE_surf_resource_set_utilization("HOST", "power_used", cpu->get_cname(), action->get_category(), value, + 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(resource); @@ -294,13 +300,13 @@ static void instr_actor_on_creation(simgrid::s4u::ActorPtr actor) 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); std::string container_name = instr_pid(actor.get()); actor->on_exit( - [container_name](int status, void* actor) { + [container_name](int status, void*) { if (status == SMX_EXIT_FAILURE) // kill means that this actor no longer exists, let's destroy it simgrid::instr::Container::by_name(container_name)->remove_from_parent(); @@ -341,7 +347,7 @@ static void instr_vm_on_creation(simgrid::s4u::Host& host) 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); } @@ -366,6 +372,11 @@ void instr_define_callbacks() 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())); + 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"); }); @@ -378,6 +389,21 @@ void instr_define_callbacks() 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::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_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_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_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_completion.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); }