/** Signal to others that a new actor has been created **/
static simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> on_creation;
+ /** Signal to others that an actor has been suspended**/
+ static simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> on_suspend;
+ /** Signal to others that an actor has been resumed **/
+ static simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> on_resume;
+ /** Signal to others that an actor is going to migrated to another host**/
+ static simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> on_migration_start;
+ /** Signal to others that an actor is has been migrated to another host **/
+ static simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> on_migration_end;
/** Signal indicating that the given actor is about to disappear */
static simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> on_destruction;
#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"
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
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
/* 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 <sstream>
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor, "S4U actors");
namespace s4u {
simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Actor::on_creation;
+simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Actor::on_suspend;
+simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Actor::on_resume;
+simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Actor::on_migration_start;
+simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Actor::on_migration_end;
simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Actor::on_destruction;
// ***** Actor creation *****
*/
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) {
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()
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()
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()