return;
}
XBT_DEBUG("Graph extraction for NetZone = %s", netzone->get_cname());
- if (not netzone->getChildren()->empty()) {
+ if (not netzone->get_children()->empty()) {
// bottom-up recursion
- for (auto const& nz_son : *netzone->getChildren()) {
+ for (auto const& nz_son : *netzone->get_children()) {
container_t child_container = container->children_.at(nz_son->get_cname());
recursiveGraphExtraction(nz_son, child_container, filter);
}
}
}
-static void instr_netzone_on_seal(simgrid::s4u::NetZone& /*netzone*/)
-{
- if (TRACE_needs_platform()) {
- currentContainer.pop_back();
- }
-}
-
static void instr_link_on_creation(simgrid::s4u::Link& link)
{
if (currentContainer.empty()) // No ongoing parsing. Are you creating the loopback?
if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_link())) {
simgrid::instr::VariableType* bandwidth = container->type_->by_name_or_create("bandwidth", "");
bandwidth->set_calling_container(container);
- bandwidth->set_event(0, link.bandwidth());
+ bandwidth->set_event(0, link.get_bandwidth());
simgrid::instr::VariableType* latency = container->type_->by_name_or_create("latency", "");
latency->set_calling_container(container);
- latency->set_event(0, link.latency());
+ latency->set_event(0, link.get_latency());
}
if (TRACE_uncategorized()) {
container->type_->by_name_or_create("bandwidth_used", "0.5 0.5 0.5");
}
}
-static void instr_host_on_speed_change(simgrid::s4u::Host* host)
+static void instr_host_on_speed_change(simgrid::s4u::Host& host)
{
- simgrid::instr::Container::by_name(host->get_cname())
+ simgrid::instr::Container::by_name(host.get_cname())
->get_variable("power")
- ->set_event(surf_get_clock(), host->getCoreCount() * host->get_available_speed());
+ ->set_event(surf_get_clock(), host.get_core_count() * host.get_available_speed());
}
-static void instr_cpu_action_on_state_change(simgrid::surf::CpuAction* action,
- simgrid::kernel::resource::Action::State /* previous */)
+static void instr_cpu_action_on_state_change(simgrid::surf::CpuAction* action)
{
simgrid::surf::Cpu* cpu = static_cast<simgrid::surf::Cpu*>(action->get_variable()->get_constraint(0)->get_id());
TRACE_surf_resource_set_utilization("HOST", "power_used", cpu->get_cname(), action->get_category(),
{
simgrid::instr::Container::by_name(link.get_cname())
->get_variable("bandwidth")
- ->set_event(surf_get_clock(), sg_bandwidth_factor * link.bandwidth());
+ ->set_event(surf_get_clock(), sg_bandwidth_factor * link.get_bandwidth());
}
static void instr_netpoint_on_creation(simgrid::kernel::routing::NetPoint* netpoint)
{
- if (netpoint->is_router() && TRACE_needs_platform() && TRACE_is_enabled())
+ if (netpoint->is_router())
new simgrid::instr::RouterContainer(netpoint->get_cname(), currentContainer.back());
}
state->add_entity_value("task_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);
-}
-static void instr_actor_on_suspend(simgrid::s4u::ActorPtr actor)
-{
- simgrid::instr::Container::by_name(instr_pid(actor.get()))->get_state("ACTOR_STATE")->push_event("suspend");
-}
-
-static void instr_actor_on_resume(simgrid::s4u::ActorPtr actor)
-{
- simgrid::instr::Container::by_name(instr_pid(actor.get()))->get_state("ACTOR_STATE")->pop_event();
+ actor->on_exit(
+ [](int status, void* actor) {
+ if (status == SMX_EXIT_FAILURE)
+ // kill means that this actor no longer exists, let's destroy it
+ simgrid::instr::Container::by_name(instr_pid(static_cast<simgrid::s4u::Actor*>(actor)))->remove_from_parent();
+ },
+ actor->get_impl());
}
static long long int counter = 0;
root->type_->by_name_or_create("VM_ACTOR_LINK", vm, vm);
}
-static void instr_vm_on_start(simgrid::s4u::VirtualMachine& vm)
-{
- simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->push_event("start");
-}
-
-static void instr_vm_on_started(simgrid::s4u::VirtualMachine& vm)
-{
- simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->pop_event();
-}
-
-static void instr_vm_on_suspend(simgrid::s4u::VirtualMachine& vm)
-{
- simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->push_event("suspend");
-}
-
-static void instr_vm_on_resume(simgrid::s4u::VirtualMachine& vm)
-{
- simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->pop_event();
-}
-
-static void instr_vm_on_destruction(simgrid::s4u::Host& host)
-{
- simgrid::instr::Container::by_name(host.get_name())->remove_from_parent();
-}
-
void instr_define_callbacks()
{
// always need the callbacks to zones (we need only the root zone), to create the rootContainer and the rootType
// properly
if (TRACE_needs_platform()) {
simgrid::s4u::on_platform_created.connect(instr_on_platform_created);
- simgrid::s4u::Host::onCreation.connect(instr_host_on_creation);
- simgrid::s4u::Host::onSpeedChange.connect(instr_host_on_speed_change);
+ simgrid::s4u::Host::on_creation.connect(instr_host_on_creation);
+ simgrid::s4u::Host::on_speed_change.connect(instr_host_on_speed_change);
simgrid::s4u::Link::on_creation.connect(instr_link_on_creation);
simgrid::s4u::Link::on_bandwidth_change.connect(instr_link_on_bandwidth_change);
+ simgrid::s4u::NetZone::on_seal.connect([](simgrid::s4u::NetZone& /*netzone*/) { currentContainer.pop_back(); });
+ simgrid::kernel::routing::NetPoint::onCreation.connect(instr_netpoint_on_creation);
}
- 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);
+ simgrid::s4u::NetZone::on_creation.connect(instr_netzone_on_creation);
- simgrid::surf::CpuAction::onStateChange.connect(instr_cpu_action_on_state_change);
+ simgrid::surf::CpuAction::on_state_change.connect(instr_cpu_action_on_state_change);
simgrid::s4u::Link::on_communication_state_change.connect(instr_link_on_communication_state_change);
if (TRACE_actor_is_enabled()) {
simgrid::s4u::Actor::on_creation.connect(instr_actor_on_creation);
- simgrid::s4u::Actor::on_suspend.connect(instr_actor_on_suspend);
- simgrid::s4u::Actor::on_resume.connect(instr_actor_on_resume);
+ 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");
+ });
+ simgrid::s4u::Actor::on_resume.connect([](simgrid::s4u::ActorPtr actor) {
+ simgrid::instr::Container::by_name(instr_pid(actor.get()))->get_state("ACTOR_STATE")->pop_event();
+ });
+ simgrid::s4u::Actor::on_sleep.connect([](simgrid::s4u::ActorPtr actor) {
+ simgrid::instr::Container::by_name(instr_pid(actor.get()))->get_state("ACTOR_STATE")->push_event("sleep");
+ });
+ 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::Actor::on_migration_start.connect(instr_actor_on_migration_start);
simgrid::s4u::Actor::on_migration_end.connect(instr_actor_on_migration_end);
}
if (TRACE_vm_is_enabled()) {
- simgrid::s4u::Host::onCreation.connect(instr_vm_on_creation);
- simgrid::s4u::VirtualMachine::on_start.connect(instr_vm_on_start);
- simgrid::s4u::VirtualMachine::on_started.connect(instr_vm_on_started);
- simgrid::s4u::VirtualMachine::on_suspend.connect(instr_vm_on_suspend);
- simgrid::s4u::VirtualMachine::on_resume.connect(instr_vm_on_resume);
- simgrid::s4u::Host::onDestruction.connect(instr_vm_on_destruction);
+ simgrid::s4u::Host::on_creation.connect(instr_vm_on_creation);
+ simgrid::s4u::VirtualMachine::on_start.connect([](simgrid::s4u::VirtualMachine& vm) {
+ simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->push_event("start");
+ });
+ simgrid::s4u::VirtualMachine::on_started.connect([](simgrid::s4u::VirtualMachine& vm) {
+ simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->pop_event();
+ });
+ simgrid::s4u::VirtualMachine::on_suspend.connect([](simgrid::s4u::VirtualMachine& vm) {
+ simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->push_event("suspend");
+ });
+ simgrid::s4u::VirtualMachine::on_resume.connect([](simgrid::s4u::VirtualMachine& vm) {
+ simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->pop_event();
+ });
+ simgrid::s4u::Host::on_destruction.connect(
+ [](simgrid::s4u::Host& host) { simgrid::instr::Container::by_name(host.get_name())->remove_from_parent(); });
}
}
/*
std::map<std::string, xbt_edge_t>* edges, sg_netzone_t netzone,
container_t container)
{
- if (not netzone->getChildren()->empty()) {
+ if (not netzone->get_children()->empty()) {
// bottom-up recursion
- for (auto const& netzone_child : *netzone->getChildren()) {
+ for (auto const& netzone_child : *netzone->get_children()) {
container_t child_container = container->children_.at(netzone_child->get_cname());
recursiveXBTGraphExtraction(graph, nodes, edges, netzone_child, child_container);
}
