X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c8f0e925189a5ec11b395e9cbe981a2440fdf5d6..406f9bbafee691a1e31084806dc15fb292fd649b:/src/smpi/internals/instr_smpi.cpp diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp index f1a25bc05b..82d5f23340 100644 --- a/src/smpi/internals/instr_smpi.cpp +++ b/src/smpi/internals/instr_smpi.cpp @@ -6,12 +6,15 @@ #include "private.hpp" #include +#include #include #include #include #include #include +#include #include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI"); @@ -83,6 +86,8 @@ static const char* smpi_colors[] = {"recv", "0 1 0.3", "accumulate", "1 0.3 0", + "migration", + "0.2 0.5 0.2", "rput", "0.3 1 0", "rget", @@ -143,14 +148,9 @@ static const char* instr_find_color(const char* state) return ret; } -XBT_PRIVATE std::string smpi_container_key(int rank) -{ - return std::string("rank-") + std::to_string(rank); -} - XBT_PRIVATE container_t smpi_container(int rank) { - return simgrid::instr::Container::byName(smpi_container_key(rank)); + return simgrid::instr::Container::by_name(std::string("rank-") + std::to_string(rank)); } static std::string TRACE_smpi_put_key(int src, int dst, int tag, int send) @@ -226,16 +226,12 @@ void TRACE_smpi_release() void TRACE_smpi_setup_container(int rank, sg_host_t host) { - std::string str = smpi_container_key(rank); - - container_t father; - if (TRACE_smpi_is_grouped()){ - father = simgrid::instr::Container::byNameOrNull(host->get_name()); - }else{ - father = simgrid::instr::Container::getRoot(); + container_t father = simgrid::instr::Container::get_root(); + if (TRACE_smpi_is_grouped()) { + father = simgrid::instr::Container::by_name_or_null(host->get_name()); + xbt_assert(father != nullptr, "Could not find a parent for mpi rank 'rank-%d' at function %s", rank, __func__); } - xbt_assert(father != nullptr, "Could not find a parent for mpi rank %s at function %s", str.c_str(), __func__); - father->createChild(str, "MPI"); // This container is of type MPI + father->create_child(std::string("rank-") + std::to_string(rank), "MPI"); // This container is of type MPI } void TRACE_smpi_init(int rank) @@ -245,7 +241,7 @@ void TRACE_smpi_init(int rank) TRACE_smpi_setup_container(rank, sg_host_self()); #if HAVE_PAPI - container_t container = simgrid::instr::Container::byName(str); + container_t container = simgrid::instr::Container::by_name(str); papi_counter_t counters = smpi_process()->papi_counters(); for (auto const& it : counters) { @@ -265,42 +261,42 @@ void TRACE_smpi_finalize(int rank) if (not TRACE_smpi_is_enabled()) return; - smpi_container(rank)->removeFromParent(); + smpi_container(rank)->remove_from_parent(); } void TRACE_smpi_computing_init(int rank) { //first use, initialize the color in the trace if (TRACE_smpi_is_enabled() && TRACE_smpi_is_computing()) - smpi_container(rank)->getState("MPI_STATE")->addEntityValue("computing", instr_find_color("computing")); + smpi_container(rank)->get_state("MPI_STATE")->add_entity_value("computing", instr_find_color("computing")); } void TRACE_smpi_computing_in(int rank, double amount) { if (TRACE_smpi_is_enabled() && TRACE_smpi_is_computing()) smpi_container(rank) - ->getState("MPI_STATE") - ->pushEvent("computing", new simgrid::instr::CpuTIData("compute", amount)); + ->get_state("MPI_STATE") + ->push_event("computing", new simgrid::instr::CpuTIData("compute", amount)); } void TRACE_smpi_computing_out(int rank) { if (TRACE_smpi_is_enabled() && TRACE_smpi_is_computing()) - smpi_container(rank)->getState("MPI_STATE")->popEvent(); + smpi_container(rank)->get_state("MPI_STATE")->pop_event(); } void TRACE_smpi_sleeping_in(int rank, double duration) { if (TRACE_smpi_is_enabled() && TRACE_smpi_is_sleeping()) smpi_container(rank) - ->getState("MPI_STATE") - ->pushEvent("sleeping", new simgrid::instr::CpuTIData("sleep", duration)); + ->get_state("MPI_STATE") + ->push_event("sleeping", new simgrid::instr::CpuTIData("sleep", duration)); } void TRACE_smpi_sleeping_out(int rank) { if (TRACE_smpi_is_enabled() && not TRACE_smpi_is_sleeping()) - smpi_container(rank)->getState("MPI_STATE")->popEvent(); + smpi_container(rank)->get_state("MPI_STATE")->pop_event(); } void TRACE_smpi_testing_in(int rank) @@ -309,15 +305,15 @@ void TRACE_smpi_testing_in(int rank) if (not TRACE_smpi_is_enabled()) return; - simgrid::instr::StateType* state = smpi_container(rank)->getState("MPI_STATE"); - state->addEntityValue("test"); - state->pushEvent("test", new simgrid::instr::NoOpTIData("test")); + simgrid::instr::StateType* state = smpi_container(rank)->get_state("MPI_STATE"); + state->add_entity_value("test"); + state->push_event("test", new simgrid::instr::NoOpTIData("test")); } void TRACE_smpi_testing_out(int rank) { if (TRACE_smpi_is_enabled()) - smpi_container(rank)->getState("MPI_STATE")->popEvent(); + smpi_container(rank)->get_state("MPI_STATE")->pop_event(); } void TRACE_smpi_comm_in(int rank, const char* operation, simgrid::instr::TIData* extra) @@ -327,15 +323,15 @@ void TRACE_smpi_comm_in(int rank, const char* operation, simgrid::instr::TIData* return; } - simgrid::instr::StateType* state = smpi_container(rank)->getState("MPI_STATE"); - state->addEntityValue(operation, instr_find_color(operation)); - state->pushEvent(operation, extra); + simgrid::instr::StateType* state = smpi_container(rank)->get_state("MPI_STATE"); + state->add_entity_value(operation, instr_find_color(operation)); + state->push_event(operation, extra); } void TRACE_smpi_comm_out(int rank) { if (TRACE_smpi_is_enabled()) - smpi_container(rank)->getState("MPI_STATE")->popEvent(); + smpi_container(rank)->get_state("MPI_STATE")->pop_event(); } void TRACE_smpi_send(int rank, int src, int dst, int tag, int size) @@ -346,7 +342,7 @@ void TRACE_smpi_send(int rank, int src, int dst, int tag, int size) std::string key = TRACE_smpi_get_key(src, dst, tag, 1); XBT_DEBUG("Send tracing from %d to %d, tag %d, with key %s", src, dst, tag, key.c_str()); - simgrid::instr::Container::getRoot()->getLink("MPI_LINK")->startEvent(smpi_container(rank), "PTP", key, size); + simgrid::instr::Container::get_root()->get_link("MPI_LINK")->start_event(smpi_container(rank), "PTP", key, size); } void TRACE_smpi_recv(int src, int dst, int tag) @@ -357,5 +353,46 @@ void TRACE_smpi_recv(int src, int dst, int tag) std::string key = TRACE_smpi_get_key(src, dst, tag, 0); XBT_DEBUG("Recv tracing from %d to %d, tag %d, with key %s", src, dst, tag, key.c_str()); - simgrid::instr::Container::getRoot()->getLink("MPI_LINK")->endEvent(smpi_container(dst), "PTP", key); + simgrid::instr::Container::get_root()->get_link("MPI_LINK")->end_event(smpi_container(dst), "PTP", key); +} + +/**************** Functions to trace the migration of tasks. *****************/ +void TRACE_smpi_send_process_data_in(int rank) +{ + if (!TRACE_smpi_is_enabled()) return; + + smpi_container(rank)->get_state("MIGRATE_STATE")->add_entity_value("migration", instr_find_color("migration")); + smpi_container(rank)->get_state("MIGRATE_STATE")->push_event("migration"); +} + +void TRACE_smpi_send_process_data_out(int rank) +{ + if (!TRACE_smpi_is_enabled()) return; + + /* Clean the process state. */ + smpi_container(rank)->get_state("MIGRATE_STATE")->pop_event(); +} + +void TRACE_smpi_process_change_host(int rank, sg_host_t new_host) +{ + if (!TRACE_smpi_is_enabled()) return; + + /** The key is (most likely) used to match the events in the trace */ + static long long int counter = 0; + std::string key = std::to_string(counter); + counter++; + + // start link (= tell the trace that this rank moves from A to B) + container_t cont = smpi_container(rank); + simgrid::instr::Container::get_root()->get_link("MIGRATE_LINK")->start_event(cont, "M", key); + + // Destroy container of this rank on this host + cont->remove_from_parent(); + + // Setup container on new host + TRACE_smpi_setup_container(rank, new_host); + + // end link + cont = smpi_container(rank); // This points to the newly created container + simgrid::instr::Container::get_root()->get_link("MIGRATE_LINK")->end_event(cont, "M", key); }