#include <xbt/graph.h>
#include "src/instr/instr_private.hpp"
+#include "src/kernel/activity/ExecImpl.hpp"
#include "src/kernel/resource/CpuImpl.hpp"
#include "src/kernel/resource/NetworkModel.hpp"
resource_set_utilization("HOST", "speed_used", cpu->get_cname(), action.get_category(), value,
action.get_last_update(), simgrid_get_clock() - action.get_last_update());
- if (const auto* link = dynamic_cast<kernel::resource::StandardLinkImpl*>(resource))
+ else if (const auto* link = dynamic_cast<kernel::resource::StandardLinkImpl*>(resource))
resource_set_utilization("LINK", "bandwidth_used", link->get_cname(), action.get_category(), value,
action.get_last_update(), simgrid_get_clock() - action.get_last_update());
}
}
+static void on_activity_suspend_resume(s4u::Activity const& activity)
+{
+ on_action_state_change(*activity.get_impl()->model_action_, /*ignored*/ kernel::resource::Action::State::STARTED);
+}
+
static void on_platform_created()
{
currentContainer.clear();
s4u::NetZone::on_creation_cb(on_netzone_creation);
- kernel::resource::CpuAction::on_state_change.connect(on_action_state_change);
+ s4u::Host::on_exec_state_change_cb(on_action_state_change);
s4u::Link::on_communication_state_change_cb(on_action_state_change);
+ s4u::Exec::on_suspend_cb(on_activity_suspend_resume);
+ s4u::Exec::on_resume_cb(on_activity_suspend_resume);
if (TRACE_actor_is_enabled()) {
s4u::Actor::on_creation_cb(on_actor_creation);
s4u::Actor::on_destruction_cb([](s4u::Actor const& actor) {
- auto container = Container::by_name_or_null(instr_pid(actor));
- if (container != nullptr)
+ if (auto* container = Container::by_name_or_null(instr_pid(actor)))
container->remove_from_parent();
});
s4u::Actor::on_suspend_cb([](s4u::Actor const& actor) {
else
Container::by_name(pid)->get_state("ACTOR_STATE")->push_event("execute");
});
- s4u::Activity::on_completion_cb([](const s4u::Activity& a) {
+
+ s4u::Exec::on_completion_cb([](const s4u::Exec& e) {
std::string pid = instr_pid(*s4u::Actor::self());
- std::string hostname;
- if (pid == "-0") { //activity is launched directly by Maestro, use the host as container
- if (const auto e = dynamic_cast<const s4u::Exec*>(&a))
- Container::by_name(e->get_host()->get_name())->get_state("HOST_STATE")->pop_event();
- if (const auto c = dynamic_cast<const s4u::Comm*>(&a)) {
- Container::by_name(c->get_source()->get_name())->get_state("HOST_STATE")->pop_event();
- Container::by_name(c->get_destination()->get_name())->get_state("HOST_STATE")->pop_event();
- }
- } else
+ if (pid == "-0") //Exec is launched directly by Maestro, use the host as container
+ Container::by_name(e.get_host()->get_name())->get_state("HOST_STATE")->pop_event();
+ else
Container::by_name(pid)->get_state("ACTOR_STATE")->pop_event();
});
- s4u::Comm::on_send_cb([](s4u::Comm const& c) {
- std::string pid = instr_pid(*s4u::Actor::self());
- if (pid == "-0") //Comm is launched directly by Maestro, use the host as container
- Container::by_name(c.get_source()->get_name())->get_state("HOST_STATE")->push_event("send");
- else
- Container::by_name(pid)->get_state("ACTOR_STATE")->push_event("send");
+
+ s4u::Comm::on_completion_cb([](const s4u::Comm& c) {
+ if (c.get_sender()) {
+ Container::by_name(instr_pid(*c.get_sender()))->get_state("ACTOR_STATE")->pop_event();
+ Container::by_name(instr_pid(*c.get_receiver()))->get_state("ACTOR_STATE")->pop_event();
+ } else {
+ Container::by_name(c.get_source()->get_name())->get_state("HOST_STATE")->pop_event();
+ Container::by_name(c.get_destination()->get_name())->get_state("HOST_STATE")->pop_event();
+ }
});
- s4u::Comm::on_recv_cb([](s4u::Comm const& c) {
+ s4u::Comm::on_start_cb([](s4u::Comm const& c) {
std::string pid = instr_pid(*s4u::Actor::self());
- if (pid == "-0") //Comm is launched directly by Maestro, use the host as container
- Container::by_name(c.get_destination()->get_name())->get_state("HOST_STATE")->push_event("receive");
- else
- Container::by_name(pid)->get_state("ACTOR_STATE")->push_event("receive");
+ if (pid == "-0") { //Comm is launched directly by Maestro, use the host as container
+ Container::by_name(c.get_source()->get_name())->get_state("HOST_STATE")->push_event("start");
+ Container::by_name(c.get_destination()->get_name())->get_state("HOST_STATE")->push_event("start");
+ }
+ });
+ s4u::Comm::on_send_cb([](s4u::Comm const&) {
+ Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->push_event("send");
+ });
+ s4u::Comm::on_recv_cb([](s4u::Comm const&) {
+ Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->push_event("receive");
});
s4u::Actor::on_host_change_cb(on_actor_host_change);
}
->get_state("MPI_STATE")
->push_event("computing", new CpuTIData("compute", exec.get_cost()));
});
- s4u::Activity::on_completion_cb([](const s4u::Activity&) {
+ s4u::Exec::on_completion_cb([](const s4u::Exec&) {
Container::by_name("rank-" + std::to_string(s4u::Actor::self()->get_pid()))->get_state("MPI_STATE")->pop_event();
});
}