A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
factoring
[simgrid.git]
/
src
/
instr
/
instr_platform.cpp
diff --git
a/src/instr/instr_platform.cpp
b/src/instr/instr_platform.cpp
index
fa042a8
..
85e7859
100644
(file)
--- a/
src/instr/instr_platform.cpp
+++ b/
src/instr/instr_platform.cpp
@@
-312,26
+312,21
@@
static void instr_actor_on_creation(simgrid::s4u::Actor const& actor)
});
}
});
}
-static long long int counter = 0;
-
-static void instr_actor_on_migration_start(simgrid::s4u::Actor const& actor)
+static void instr_actor_on_host_change(simgrid::s4u::Actor const& actor,
+ simgrid::s4u::Host const& /*previous_location*/)
{
{
- // start link
+ static long long int counter = 0;
container_t container = simgrid::instr::Container::by_name(instr_pid(actor));
container_t container = simgrid::instr::Container::by_name(instr_pid(actor));
- simgrid::instr::
Container::get_root()->get_link("ACTOR_LINK")->start_event(container, "M", std::to_string(counter)
);
+ simgrid::instr::
LinkType* link = simgrid::instr::Container::get_root()->get_link("ACTOR_LINK"
);
+ // start link
+ link->start_event(container, "M", std::to_string(counter));
// destroy existing container of this process
container->remove_from_parent();
// destroy existing container of this process
container->remove_from_parent();
-}
-
-static void instr_actor_on_migration_end(simgrid::s4u::Actor const& actor)
-{
// create new container on the new_host location
simgrid::instr::Container::by_name(actor.get_host()->get_name())->create_child(instr_pid(actor), "ACTOR");
// end link
// create new container on the new_host location
simgrid::instr::Container::by_name(actor.get_host()->get_name())->create_child(instr_pid(actor), "ACTOR");
// end link
- simgrid::instr::Container::get_root()
- ->get_link("ACTOR_LINK")
- ->end_event(simgrid::instr::Container::by_name(instr_pid(actor)), "M", std::to_string(counter));
+ link->end_event(container, "M", std::to_string(counter));
counter++;
}
counter++;
}
@@
-388,10
+383,10
@@
void instr_define_callbacks()
simgrid::s4u::Actor::on_wake_up.connect([](simgrid::s4u::Actor const& actor) {
simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event();
});
simgrid::s4u::Actor::on_wake_up.connect([](simgrid::s4u::Actor const& actor) {
simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event();
});
- simgrid::s4u::Exec::on_start.connect([](simgrid::s4u::Actor const& actor) {
+ simgrid::s4u::Exec::on_start.connect([](simgrid::s4u::Actor const& actor
, simgrid::s4u::Exec const&
) {
simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("execute");
});
simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("execute");
});
- simgrid::s4u::Exec::on_completion.connect([](simgrid::s4u::Actor const& actor) {
+ simgrid::s4u::Exec::on_completion.connect([](simgrid::s4u::Actor const& actor
, simgrid::s4u::Exec const&
) {
simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event();
});
simgrid::s4u::Comm::on_sender_start.connect([](simgrid::s4u::Actor const& actor) {
simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event();
});
simgrid::s4u::Comm::on_sender_start.connect([](simgrid::s4u::Actor const& actor) {
@@
-403,8
+398,7
@@
void instr_define_callbacks()
simgrid::s4u::Comm::on_completion.connect([](simgrid::s4u::Actor const& actor) {
simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event();
});
simgrid::s4u::Comm::on_completion.connect([](simgrid::s4u::Actor const& actor) {
simgrid::instr::Container::by_name(instr_pid(actor))->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);
+ simgrid::s4u::Actor::on_host_change.connect(instr_actor_on_host_change);
}
if (TRACE_vm_is_enabled()) {
}
if (TRACE_vm_is_enabled()) {