X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1b89437671ba572a199dd4ff5766ba82720cdf03..b372d23d3d8818b4547ef207f43b45709298a002:/src/instr/instr_platform.cpp diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp index 26acc23a17..c8936419b4 100644 --- a/src/instr/instr_platform.cpp +++ b/src/instr/instr_platform.cpp @@ -29,34 +29,29 @@ std::string instr_pid(simgrid::s4u::Actor const& proc) return std::string(proc.get_name()) + "-" + std::to_string(proc.get_pid()); } -static container_t lowestCommonAncestor(const simgrid::instr::Container* a1, const simgrid::instr::Container* a2) +static simgrid::instr::Container* lowestCommonAncestor(const simgrid::instr::Container* a1, + const simgrid::instr::Container* a2) { // this is only an optimization (since most of a1 and a2 share the same parent) if (a1->father_ == a2->father_) return a1->father_; // create an array with all ancestors of a1 - std::vector ancestors_a1; - container_t p = a1->father_; - while (p) { + std::vector ancestors_a1; + for (auto* p = a1->father_; p != nullptr; p = p->father_) ancestors_a1.push_back(p); - p = p->father_; - } // create an array with all ancestors of a2 - std::vector ancestors_a2; - p = a2->father_; - while (p) { + std::vector ancestors_a2; + for (auto* p = a2->father_; p != nullptr; p = p->father_) ancestors_a2.push_back(p); - p = p->father_; - } // find the lowest ancestor - p = nullptr; + simgrid::instr::Container* p = nullptr; int i = static_cast(ancestors_a1.size()) - 1; int j = static_cast(ancestors_a2.size()) - 1; while (i >= 0 && j >= 0) { - container_t a1p = ancestors_a1.at(i); + simgrid::instr::Container* a1p = ancestors_a1.at(i); const simgrid::instr::Container* a2p = ancestors_a2.at(j); if (a1p == a2p) { p = a1p; @@ -69,7 +64,8 @@ static container_t lowestCommonAncestor(const simgrid::instr::Container* a1, con return p; } -static void linkContainers(container_t src, container_t dst, std::set* filter) +static void linkContainers(simgrid::instr::Container* src, simgrid::instr::Container* dst, + std::set>* filter) { // ignore loopback if (src->get_name() == "__loopback__" || dst->get_name() == "__loopback__") { @@ -78,7 +74,7 @@ static void linkContainers(container_t src, container_t dst, std::set %s", src->get_cname(), dst->get_cname()); } -static void recursiveGraphExtraction(const simgrid::s4u::NetZone* netzone, container_t container, - std::set* filter) +static void recursiveGraphExtraction(const simgrid::s4u::NetZone* netzone, simgrid::instr::Container* container, + std::set>* filter) { if (not TRACE_platform_topology()) { XBT_DEBUG("Graph extraction disabled by user."); @@ -129,23 +125,21 @@ static void recursiveGraphExtraction(const simgrid::s4u::NetZone* netzone, conta if (not netzone->get_children().empty()) { // bottom-up recursion for (auto const& nz_son : netzone->get_children()) { - container_t child_container = container->children_.at(nz_son->get_name()); + simgrid::instr::Container* child_container = container->children_.at(nz_son->get_name()); recursiveGraphExtraction(nz_son, child_container, filter); } } auto* graph = xbt_graph_new_graph(0, nullptr); - auto* nodes = new std::map(); - auto* edges = new std::map(); + std::map> nodes; + std::map> edges; - netzone->get_impl()->get_graph(graph, nodes, edges); - for (auto elm : *edges) { + netzone->get_impl()->get_graph(graph, &nodes, &edges); + for (auto const& elm : edges) { const xbt_edge* edge = elm.second; linkContainers(simgrid::instr::Container::by_name(static_cast(edge->src->data)), simgrid::instr::Container::by_name(static_cast(edge->dst->data)), filter); } - delete nodes; - delete edges; xbt_graph_free_graph(graph, xbt_free_f, xbt_free_f, nullptr); } @@ -223,9 +217,9 @@ namespace instr { void platform_graph_export_graphviz(const std::string& output_filename) { auto* g = xbt_graph_new_graph(0, nullptr); - auto* nodes = new std::map(); - auto* edges = new std::map(); - s4u::Engine::get_instance()->get_netzone_root()->extract_xbt_graph(g, nodes, edges); + std::map> nodes; + std::map> edges; + s4u::Engine::get_instance()->get_netzone_root()->extract_xbt_graph(g, &nodes, &edges); std::ofstream fs; fs.open(output_filename, std::ofstream::out); @@ -241,10 +235,10 @@ void platform_graph_export_graphviz(const std::string& output_filename) fs << " node [shape=box, style=filled]" << std::endl; fs << " node [width=.3, height=.3, style=filled, color=skyblue]" << std::endl << std::endl; - for (auto const& elm : *nodes) + for (auto const& elm : nodes) fs << " \"" << elm.first << "\";" << std::endl; - for (auto const& elm : *edges) { + for (auto const& elm : edges) { const char* src_s = static_cast(elm.second->src->data); const char* dst_s = static_cast(elm.second->dst->data); if (g->directed) @@ -256,8 +250,6 @@ void platform_graph_export_graphviz(const std::string& output_filename) fs.close(); xbt_graph_free_graph(g, xbt_free_f, xbt_free_f, nullptr); - delete nodes; - delete edges; } /* Callbacks */ @@ -270,11 +262,10 @@ static void on_netzone_creation(s4u::NetZone const& netzone) xbt_assert(Container::get_root() == root); if (TRACE_smpi_is_enabled()) { - ContainerType* mpi = root->type_->by_name_or_create("MPI"); + auto* mpi = root->type_->by_name_or_create("MPI"); if (not TRACE_smpi_is_grouped()) mpi->by_name_or_create("MPI_STATE"); root->type_->by_name_or_create("MPI_LINK", mpi, mpi); - // TODO See if we can move this to the LoadBalancer plugin root->type_->by_name_or_create("MIGRATE_LINK", mpi, mpi); mpi->by_name_or_create("MIGRATE_STATE"); } @@ -332,9 +323,8 @@ static void on_host_creation(s4u::Host const& host) container->type_->by_name_or_create("speed_used", "0.5 0.5 0.5"); if (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()) { - ContainerType* mpi = container->type_->by_name_or_create("MPI"); + auto* mpi = container->type_->by_name_or_create("MPI"); mpi->by_name_or_create("MPI_STATE"); - // TODO See if we can move this to the LoadBalancer plugin root->type_->by_name_or_create("MIGRATE_LINK", mpi, mpi); mpi->by_name_or_create("MIGRATE_STATE"); } @@ -366,11 +356,10 @@ static void on_action_state_change(kernel::resource::Action const& action, static void on_platform_created() { currentContainer.clear(); - auto* filter = new std::set(); + std::set> filter; XBT_DEBUG("Starting graph extraction."); - recursiveGraphExtraction(s4u::Engine::get_instance()->get_netzone_root(), Container::get_root(), filter); + recursiveGraphExtraction(s4u::Engine::get_instance()->get_netzone_root(), Container::get_root(), &filter); XBT_DEBUG("Graph extraction finished."); - delete filter; dump_buffer(true); } @@ -381,8 +370,8 @@ static void on_actor_creation(s4u::Actor const& actor) std::string container_name = instr_pid(actor); container->create_child(container_name, "ACTOR"); - ContainerType* actor_type = container->type_->by_name_or_create("ACTOR"); - StateType* state = actor_type->by_name_or_create("ACTOR_STATE"); + auto* actor_type = container->type_->by_name_or_create("ACTOR"); + auto* state = actor_type->by_name_or_create("ACTOR_STATE"); state->add_entity_value("suspend", "1 0 1"); state->add_entity_value("sleep", "1 1 0"); state->add_entity_value("receive", "1 0 0"); @@ -400,7 +389,7 @@ static void on_actor_creation(s4u::Actor const& actor) static void on_actor_host_change(s4u::Actor const& actor, s4u::Host const& /*previous_location*/) { static long long int counter = 0; - container_t container = Container::by_name(instr_pid(actor)); + Container* container = Container::by_name(instr_pid(actor)); LinkType* link = Container::get_root()->get_link("ACTOR_LINK"); // start link @@ -418,8 +407,8 @@ static void on_vm_creation(s4u::Host const& host) { const Container* container = new HostContainer(host, currentContainer.back()); const Container* root = Container::get_root(); - ContainerType* vm = container->type_->by_name_or_create("VM"); - StateType* state = vm->by_name_or_create("VM_STATE"); + auto* vm = container->type_->by_name_or_create("VM"); + auto* state = vm->by_name_or_create("VM_STATE"); state->add_entity_value("suspend", "1 0 1"); state->add_entity_value("sleep", "1 1 0"); state->add_entity_value("receive", "1 0 0"); @@ -476,31 +465,33 @@ void define_callbacks() }); s4u::Actor::on_wake_up.connect( [](s4u::Actor const& actor) { Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event(); }); - s4u::Exec::on_start.connect([](simgrid::s4u::Actor const& actor, s4u::Exec const&) { - Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("execute"); + s4u::Exec::on_start.connect([](s4u::Exec const&) { + Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->push_event("execute"); }); - s4u::Exec::on_completion.connect([](s4u::Actor const& actor, s4u::Exec const&) { - Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event(); + s4u::Exec::on_completion.connect([](s4u::Exec const&) { + Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->pop_event(); }); - s4u::Comm::on_sender_start.connect([](s4u::Actor const& actor) { - Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("send"); + s4u::Comm::on_start.connect([](s4u::Comm const&, bool is_sender) { + Container::by_name(instr_pid(*s4u::Actor::self())) + ->get_state("ACTOR_STATE") + ->push_event(is_sender ? "send" : "receive"); }); - s4u::Comm::on_receiver_start.connect([](s4u::Actor const& actor) { - Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("receive"); + s4u::Comm::on_completion.connect([](s4u::Comm const&) { + Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->pop_event(); }); - s4u::Comm::on_completion.connect( - [](s4u::Actor const& actor) { Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event(); }); s4u::Actor::on_host_change.connect(on_actor_host_change); } if (TRACE_smpi_is_enabled() && TRACE_smpi_is_computing()) { - s4u::Exec::on_start.connect([](simgrid::s4u::Actor const& actor, s4u::Exec const& exec) { - Container::by_name(std::string("rank-") + std::to_string(actor.get_pid())) + s4u::Exec::on_start.connect([](s4u::Exec const& exec) { + Container::by_name(std::string("rank-") + std::to_string(s4u::Actor::self()->get_pid())) ->get_state("MPI_STATE") ->push_event("computing", new CpuTIData("compute", exec.get_cost())); }); - s4u::Exec::on_completion.connect([](s4u::Actor const& actor, s4u::Exec const&) { - Container::by_name(std::string("rank-") + std::to_string(actor.get_pid()))->get_state("MPI_STATE")->pop_event(); + s4u::Exec::on_completion.connect([](s4u::Exec const&) { + Container::by_name(std::string("rank-") + std::to_string(s4u::Actor::self()->get_pid())) + ->get_state("MPI_STATE") + ->pop_event(); }); }