From: Frederic Suter Date: Sat, 5 May 2018 14:20:36 +0000 (+0200) Subject: use signals and callbacks to trace actors X-Git-Tag: v3.20~284 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/23915072bbacb40c5757911a9125eff7f119c52e use signals and callbacks to trace actors --- diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp index a91b18bb08..4db7d481c1 100644 --- a/include/simgrid/s4u/Actor.hpp +++ b/include/simgrid/s4u/Actor.hpp @@ -152,6 +152,14 @@ public: /** Signal to others that a new actor has been created **/ static simgrid::xbt::signal on_creation; + /** Signal to others that an actor has been suspended**/ + static simgrid::xbt::signal on_suspend; + /** Signal to others that an actor has been resumed **/ + static simgrid::xbt::signal on_resume; + /** Signal to others that an actor is going to migrated to another host**/ + static simgrid::xbt::signal on_migration_start; + /** Signal to others that an actor is has been migrated to another host **/ + static simgrid::xbt::signal on_migration_end; /** Signal indicating that the given actor is about to disappear */ static simgrid::xbt::signal on_destruction; diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp index 8389127bd3..58e51f8e08 100644 --- a/src/instr/instr_platform.cpp +++ b/src/instr/instr_platform.cpp @@ -7,6 +7,7 @@ #include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/kernel/routing/NetZoneImpl.hpp" +#include "simgrid/s4u/Actor.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" #include "src/surf/network_interface.hpp" @@ -271,6 +272,39 @@ static void instr_on_platform_created() TRACE_paje_dump_buffer(true); } +static void instr_on_actor_suspend(simgrid::s4u::ActorPtr actor) +{ + simgrid::instr::Container::byName(instr_pid(actor.get()))->getState("ACTOR_STATE")->pushEvent("suspend"); +} + +static void instr_on_actor_resume(simgrid::s4u::ActorPtr actor) +{ + simgrid::instr::Container::byName(instr_pid(actor.get()))->getState("ACTOR_STATE")->popEvent(); +} + +static long long int counter = 0; + +static void instr_on_actor_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)); + + // destroy existing container of this process + container->removeFromParent(); +} + +static void instr_on_actor_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"); + // end link + simgrid::instr::Container::getRoot() + ->getLink("ACTOR_LINK") + ->endEvent(simgrid::instr::Container::byName(instr_pid(actor.get())), "M", std::to_string(counter)); + counter++; +} + void instr_define_callbacks() { // always need the callbacks to zones (we need only the root zone), to create the rootContainer and the rootType @@ -283,6 +317,12 @@ void instr_define_callbacks() 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); + if (TRACE_actor_is_enabled()) { + simgrid::s4u::Actor::on_suspend.connect(instr_on_actor_suspend); + simgrid::s4u::Actor::on_resume.connect(instr_on_actor_resume); + simgrid::s4u::Actor::on_migration_start.connect(instr_on_actor_migration_start); + simgrid::s4u::Actor::on_migration_end.connect(instr_on_actor_migration_end); + } } /* * user categories support diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp index 106811e023..ed3d1c524d 100644 --- a/src/instr/instr_private.hpp +++ b/src/instr/instr_private.hpp @@ -9,6 +9,7 @@ #include #include "simgrid/instr.h" +#include "simgrid/s4u/Actor.hpp" #include "simgrid_config.h" #include "src/instr/instr_paje_containers.hpp" #include "src/instr/instr_paje_events.hpp" diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp index e4744b6638..b342ac47f3 100644 --- a/src/s4u/s4u_Actor.cpp +++ b/src/s4u/s4u_Actor.cpp @@ -3,11 +3,12 @@ /* 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/actor.h" #include "simgrid/s4u/Actor.hpp" #include "simgrid/s4u/Exec.hpp" #include "simgrid/s4u/Host.hpp" -#include "src/instr/instr_private.hpp" #include "src/simix/smx_private.hpp" +#include XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor, "S4U actors"); @@ -15,6 +16,10 @@ namespace simgrid { namespace s4u { simgrid::xbt::signal s4u::Actor::on_creation; +simgrid::xbt::signal s4u::Actor::on_suspend; +simgrid::xbt::signal s4u::Actor::on_resume; +simgrid::xbt::signal s4u::Actor::on_migration_start; +simgrid::xbt::signal s4u::Actor::on_migration_end; simgrid::xbt::signal s4u::Actor::on_destruction; // ***** Actor creation ***** @@ -83,23 +88,7 @@ void Actor::on_exit(int_f_pvoid_pvoid_t fun, void* data) */ void Actor::migrate(Host* new_host) { - std::string key; - simgrid::instr::LinkType* link = nullptr; - bool tracing = TRACE_actor_is_enabled(); - if (tracing) { - static long long int counter = 0; - - key = std::to_string(counter); - counter++; - - // start link - container_t actor_container = simgrid::instr::Container::byName(instr_pid(this)); - link = simgrid::instr::Container::getRoot()->getLink("ACTOR_LINK"); - link->startEvent(actor_container, "M", key); - - // destroy existing container of this process - actor_container->removeFromParent(); - } + s4u::Actor::on_migration_start(this); simgrid::simix::kernelImmediate([this, new_host]() { if (pimpl_->waiting_synchro != nullptr) { @@ -113,12 +102,7 @@ void Actor::migrate(Host* new_host) SIMIX_process_change_host(this->pimpl_, new_host); }); - if (tracing) { - // create new container on the new_host location - simgrid::instr::Container::byName(new_host->get_name())->createChild(instr_pid(this), "ACTOR"); - // end link - link->endEvent(simgrid::instr::Container::byName(instr_pid(this)), "M", key); - } + s4u::Actor::on_migration_end(this); } s4u::Host* Actor::get_host() @@ -158,17 +142,14 @@ aid_t Actor::get_ppid() const void Actor::suspend() { - if (TRACE_actor_is_enabled()) - simgrid::instr::Container::byName(instr_pid(this))->getState("ACTOR_STATE")->pushEvent("suspend"); - + s4u::Actor::on_suspend(this); simcall_process_suspend(pimpl_); } void Actor::resume() { simgrid::simix::kernelImmediate([this] { pimpl_->resume(); }); - if (TRACE_actor_is_enabled()) - simgrid::instr::Container::byName(instr_pid(this))->getState("ACTOR_STATE")->popEvent(); + s4u::Actor::on_resume(this); } int Actor::is_suspended() @@ -355,20 +336,17 @@ Host* get_host() void suspend() { - if (TRACE_actor_is_enabled()) - instr::Container::byName(get_name() + "-" + std::to_string(get_pid())) - ->getState("ACTOR_STATE") - ->pushEvent("suspend"); - simcall_process_suspend(SIMIX_process_self()); + smx_actor_t actor = SIMIX_process_self(); + simgrid::s4u::Actor::on_suspend(actor->iface()); + + simcall_process_suspend(actor); } void resume() { smx_actor_t process = SIMIX_process_self(); simgrid::simix::kernelImmediate([process] { process->resume(); }); - - if (TRACE_actor_is_enabled()) - instr::Container::byName(get_name() + "-" + std::to_string(get_pid()))->getState("ACTOR_STATE")->popEvent(); + simgrid::s4u::Actor::on_resume(process->iface()); } bool is_suspended()