X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6dfe61eeb1741e8bc43d9c84826ce16fcbf88984..6c020fef89dec22e8be9785ae502de63d62ddda8:/src/smpi/internals/instr_smpi.cpp diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp index c95b5d9244..d13557d649 100644 --- a/src/smpi/internals/instr_smpi.cpp +++ b/src/smpi/internals/instr_smpi.cpp @@ -1,106 +1,76 @@ -/* Copyright (c) 2010, 2012-2017. The SimGrid Team. +/* Copyright (c) 2010, 2012-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "private.h" #include "private.hpp" +#include #include #include #include #include #include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI"); -static std::unordered_map*> keys; - -static const char *smpi_colors[] ={ - "recv", "1 0 0", - "irecv", "1 0.52 0.52", - "send", "0 0 1", - "isend", "0.52 0.52 1", - "sendrecv", "0 1 1", - "wait", "1 1 0", - "waitall", "0.78 0.78 0", - "waitany", "0.78 0.78 0.58", - "test", "0.52 0.52 0", - - "allgather", "1 0 0", - "allgatherv", "1 0.52 0.52", - "allreduce", "1 0 1", - "alltoall", "0.52 0 1", - "alltoallv", "0.78 0.52 1", - "barrier", "0 0.78 0.78", - "bcast", "0 0.78 0.39", - "gather", "1 1 0", - "gatherv", "1 1 0.52", - "reduce", "0 1 0", - "reducescatter", "0.52 1 0.52", - "scan", "1 0.58 0.23", - "exscan", "1 0.54 0.25", - "scatterv", "0.52 0 0.52", - "scatter", "1 0.74 0.54", - - "computing", "0 1 1", - "sleeping", "0 0.5 0.5", - - "init", "0 1 0", - "finalize", "0 1 0", - - "put", "0.3 1 0", - "get", "0 1 0.3", - "accumulate", "1 0.3 0", - "win_fence", "1 0 0.3", - "win_post", "1 0 0.8", - "win_wait", "1 0.8 0", - "win_start", "0.8 0 1", - "win_complete", "0.8 1 0", - nullptr, nullptr, -}; +static std::unordered_map*> keys; -static char *str_tolower (const char *str) -{ - char* ret = xbt_strdup(str); - int n = strlen(ret); - for (int i = 0; i < n; i++) - ret[i] = tolower (str[i]); - return ret; -} +static const char* smpi_colors[] = { + "recv", "1 0 0", "irecv", "1 0.52 0.52", "send", "0 0 1", + "isend", "0.52 0.52 1", "sendrecv", "0 1 1", "wait", "1 1 0", + "waitall", "0.78 0.78 0", "waitany", "0.78 0.78 0.58", "test", "0.52 0.52 0", + + "allgather", "1 0 0", "allgatherv", "1 0.52 0.52", "allreduce", "1 0 1", + "alltoall", "0.52 0 1", "alltoallv", "0.78 0.52 1", "barrier", "0 0.78 0.78", + "bcast", "0 0.78 0.39", "gather", "1 1 0", "gatherv", "1 1 0.52", + "reduce", "0 1 0", "reducescatter", "0.52 1 0.52", "scan", "1 0.58 0.23", + "exscan", "1 0.54 0.25", "scatterv", "0.52 0 0.52", "scatter", "1 0.74 0.54", + + "computing", "0 1 1", "sleeping", "0 0.5 0.5", -static const char *instr_find_color (const char *state) + "init", "0 1 0", "finalize", "0 1 0", + + "put", "0.3 1 0", "get", "0 1 0.3", "accumulate", "1 0.3 0", + "rput", "0.3 1 0", "rget", "0 1 0.3", "raccumulate", "1 0.3 0", + "compare_and_swap", "0.3 1 0", "get_accumulate", "0 1 0.3", "rget_accumulate", "1 0.3 0", + "win_fence", "1 0 0.3", "win_post", "1 0 0.8", "win_wait", "1 0.8 0", + "win_start", "0.8 0 1", "win_complete", "0.8 1 0", "win_lock", "1 0 0.3", + "win_unlock", "1 0 0.3", "win_lock_all", "1 0 0.8", "win_unlock_all", "1 0.8 0", + "win_flush", "1 0 0.3", "win_flush_local", "1 0 0.8", "win_flush_all", "1 0.8 0", + "win_flush_local_all", "1 0 0.3", "" , "" +}; + +static const char* instr_find_color(const char* state) { - char* target = str_tolower(state); + std::string target = std::string(state); + boost::algorithm::to_lower(target); const char* ret = nullptr; unsigned int i = 0; const char* current = smpi_colors[i]; while (current != nullptr) { - if (strcmp (state, current) == 0 //exact match - || strstr(target, current) != 0 ){//as substring - ret = smpi_colors[i+1]; - break; + if (target == current // exact match + || strstr(target.c_str(), current) != 0) { // as substring + ret = smpi_colors[i + 1]; + break; } i+=2; current = smpi_colors[i]; } - xbt_free(target); return ret; } -XBT_PRIVATE char *smpi_container(int rank, char *container, int n) +XBT_PRIVATE container_t smpi_container(int rank) { - snprintf(container, n, "rank-%d", rank); - return container; + return simgrid::instr::Container::byName(std::string("rank-") + std::to_string(rank)); } -static char *TRACE_smpi_get_key(int src, int dst, int tag, char *key, int n, int send); - -static char *TRACE_smpi_put_key(int src, int dst, int tag, char *key, int n, int send) +static std::string TRACE_smpi_put_key(int src, int dst, int tag, int send) { - //get the dynar for src#dst - char aux[INSTR_DEFAULT_STR_SIZE]; - snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d#%d#%d", src, dst, tag, send); + // get the deque for src#dst + std::string aux = + std::to_string(src) + "#" + std::to_string(dst) + "#" + std::to_string(tag) + "#" + std::to_string(send); auto it = keys.find(aux); std::deque* d; @@ -113,7 +83,8 @@ static char *TRACE_smpi_put_key(int src, int dst, int tag, char *key, int n, int //generate the key static unsigned long long counter = 0; counter++; - snprintf(key, n, "%d_%d_%d_%llu", src, dst, tag, counter); + std::string key = + std::to_string(src) + "_" + std::to_string(dst) + "_" + std::to_string(tag) + "_" + std::to_string(counter); //push it d->push_back(key); @@ -121,16 +92,17 @@ static char *TRACE_smpi_put_key(int src, int dst, int tag, char *key, int n, int return key; } -static char *TRACE_smpi_get_key(int src, int dst, int tag, char *key, int n, int send) +static std::string TRACE_smpi_get_key(int src, int dst, int tag, int send) { - char aux[INSTR_DEFAULT_STR_SIZE]; - snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d#%d#%d", src, dst, tag, send==1?0:1); + std::string key; + std::string aux = std::to_string(src) + "#" + std::to_string(dst) + "#" + std::to_string(tag) + "#" + + std::to_string(send == 1 ? 0 : 1); auto it = keys.find(aux); if (it == keys.end()) { // first posted - TRACE_smpi_put_key(src, dst, tag, key, n, send); + key = TRACE_smpi_put_key(src, dst, tag, send); } else { - snprintf(key, n, "%s", it->second->front().c_str()); + key = it->second->front(); it->second->pop_front(); } return key; @@ -138,16 +110,6 @@ static char *TRACE_smpi_get_key(int src, int dst, int tag, char *key, int n, int static std::unordered_map process_category; -static void cleanup_extra_data (instr_extra_data extra){ - if(extra!=nullptr){ - if(extra->sendcounts!=nullptr) - xbt_free(extra->sendcounts); - if(extra->recvcounts!=nullptr) - xbt_free(extra->recvcounts); - xbt_free(extra); - } -} - void TRACE_internal_smpi_set_category (const char *category) { if (not TRACE_smpi_is_enabled()) @@ -176,7 +138,7 @@ void TRACE_smpi_alloc() void TRACE_smpi_release() { - for (auto elm : keys) + for (auto const& elm : keys) delete elm.second; } @@ -185,31 +147,29 @@ void TRACE_smpi_init(int rank) if (not TRACE_smpi_is_enabled()) return; - char str[INSTR_DEFAULT_STR_SIZE]; - smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); + std::string str = std::string("rank-") + std::to_string(rank); container_t father; if (TRACE_smpi_is_grouped()){ - father = PJ_container_get(sg_host_self_get_name()); + father = simgrid::instr::Container::byNameOrNull(sg_host_self_get_name()); }else{ - father = PJ_container_get_root (); + father = simgrid::instr::Container::getRoot(); } - xbt_assert(father!=nullptr, - "Could not find a parent for mpi rank %s at function %s", str, __FUNCTION__); + xbt_assert(father != nullptr, "Could not find a parent for mpi rank %s at function %s", str.c_str(), __FUNCTION__); #if HAVE_PAPI container_t container = #endif - PJ_container_new(str, INSTR_SMPI, father); + new simgrid::instr::Container(str, "MPI", father); #if HAVE_PAPI papi_counter_t counters = smpi_process()->papi_counters(); - for (auto& it : counters) { + for (auto const& it : counters) { /** * Check whether this variable already exists or not. Otherwise, it will be created * multiple times but only the last one would be used... */ - if (s_type::s_type_get_or_null(it.first.c_str(), container->type) == nullptr) { - s_type::s_type_variable_new(it.first.c_str(), nullptr, container->type); + if (s_type::getOrNull(it.first.c_str(), container->type_) == nullptr) { + Type::variableNew(it.first.c_str(), "", container->type_); } } #endif @@ -220,178 +180,86 @@ void TRACE_smpi_finalize(int rank) if (not TRACE_smpi_is_enabled()) return; - char str[INSTR_DEFAULT_STR_SIZE]; - container_t container = PJ_container_get(smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE)); - PJ_container_remove_from_parent (container); - PJ_container_free (container); -} - -void TRACE_smpi_collective_in(int rank, const char *operation, instr_extra_data extra) -{ - if (not TRACE_smpi_is_enabled()) { - cleanup_extra_data(extra); - return; - } - - char str[INSTR_DEFAULT_STR_SIZE]; - smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); - container_t container = PJ_container_get (str); - type_t type = PJ_type_get ("MPI_STATE", container->type); - const char *color = instr_find_color (operation); - value* val = value::get_or_new(operation, color, type); - new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast(extra)); -} - -void TRACE_smpi_collective_out(int rank, const char *operation) -{ - if (not TRACE_smpi_is_enabled()) - return; - - char str[INSTR_DEFAULT_STR_SIZE]; - smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); - container_t container = PJ_container_get (str); - type_t type = PJ_type_get ("MPI_STATE", container->type); - - new PopStateEvent (SIMIX_get_clock(), container, type); + container_t container = smpi_container(rank); + container->removeFromParent(); + delete container; } void TRACE_smpi_computing_init(int rank) { //first use, initialize the color in the trace - if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_computing()) - return; - - char str[INSTR_DEFAULT_STR_SIZE]; - smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); - container_t container = PJ_container_get(str); - type_t type = PJ_type_get("MPI_STATE", container->type); - const char* color = instr_find_color("computing"); - new PushStateEvent(SIMIX_get_clock(), container, type, value::get_or_new("computing", color, type)); + if (TRACE_smpi_is_enabled() && TRACE_smpi_is_computing()) + smpi_container(rank)->getState("MPI_STATE")->addEntityValue("computing", instr_find_color("computing")); } -void TRACE_smpi_computing_in(int rank, instr_extra_data extra) +void TRACE_smpi_computing_in(int rank, double amount) { - //do not forget to set the color first, otherwise this will explode - if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_computing()) { - cleanup_extra_data(extra); - return; - } - - char str[INSTR_DEFAULT_STR_SIZE]; - smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); - container_t container = PJ_container_get (str); - type_t type = PJ_type_get ("MPI_STATE", container->type); - value* val = value::get_or_new("computing", nullptr, type); - new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast(extra)); + if (TRACE_smpi_is_enabled() && TRACE_smpi_is_computing()) + smpi_container(rank) + ->getState("MPI_STATE") + ->pushEvent("computing", new simgrid::instr::CpuTIData("compute", amount)); } void TRACE_smpi_computing_out(int rank) { - if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_computing()) - return; - char str[INSTR_DEFAULT_STR_SIZE]; - smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); - container_t container = PJ_container_get (str); - type_t type = PJ_type_get ("MPI_STATE", container->type); - new PopStateEvent (SIMIX_get_clock(), container, type); + if (TRACE_smpi_is_enabled() && TRACE_smpi_is_computing()) + smpi_container(rank)->getState("MPI_STATE")->popEvent(); } -void TRACE_smpi_sleeping_init(int rank) +void TRACE_smpi_sleeping_init(int rank) // FIXME: this function is never called { //first use, initialize the color in the trace - if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_sleeping()) - return; - - char str[INSTR_DEFAULT_STR_SIZE]; - smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); - container_t container = PJ_container_get (str); - type_t type = PJ_type_get ("MPI_STATE", container->type); - const char *color = instr_find_color ("sleeping"); - value* val = value::get_or_new("sleeping", color, type); - new PushStateEvent(SIMIX_get_clock(), container, type, val); + if (TRACE_smpi_is_enabled() && TRACE_smpi_is_sleeping()) + smpi_container(rank)->getState("MPI_STATE")->addEntityValue("sleeping", instr_find_color("sleeping")); } -void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra) +void TRACE_smpi_sleeping_in(int rank, double duration) { - //do not forget to set the color first, otherwise this will explode - if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_sleeping()) { - cleanup_extra_data(extra); - return; - } - - char str[INSTR_DEFAULT_STR_SIZE]; - smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); - container_t container = PJ_container_get (str); - type_t type = PJ_type_get ("MPI_STATE", container->type); - value* val = value::get_or_new("sleeping", nullptr, type); - new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast(extra)); + if (TRACE_smpi_is_enabled() && TRACE_smpi_is_sleeping()) + smpi_container(rank) + ->getState("MPI_STATE") + ->pushEvent("sleeping", new simgrid::instr::CpuTIData("sleep", duration)); } void TRACE_smpi_sleeping_out(int rank) { - if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_sleeping()) - return; - char str[INSTR_DEFAULT_STR_SIZE]; - smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); - container_t container = PJ_container_get (str); - type_t type = PJ_type_get ("MPI_STATE", container->type); - new PopStateEvent (SIMIX_get_clock(), container, type); + if (TRACE_smpi_is_enabled() && not TRACE_smpi_is_sleeping()) + smpi_container(rank)->getState("MPI_STATE")->popEvent(); } -void TRACE_smpi_testing_in(int rank, instr_extra_data extra) +void TRACE_smpi_testing_in(int rank) { //do not forget to set the color first, otherwise this will explode - if (not TRACE_smpi_is_enabled()) { - cleanup_extra_data(extra); + if (not TRACE_smpi_is_enabled()) return; - } - char str[INSTR_DEFAULT_STR_SIZE]; - smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); - container_t container = PJ_container_get (str); - type_t type = PJ_type_get ("MPI_STATE", container->type); - value* val = value::get_or_new("test", nullptr, type); - new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast(extra)); + simgrid::instr::StateType* state = smpi_container(rank)->getState("MPI_STATE"); + state->addEntityValue("test"); + state->pushEvent("test", new simgrid::instr::NoOpTIData("test")); } void TRACE_smpi_testing_out(int rank) { - if (not TRACE_smpi_is_enabled()) - return; - char str[INSTR_DEFAULT_STR_SIZE]; - smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); - container_t container = PJ_container_get (str); - type_t type = PJ_type_get ("MPI_STATE", container->type); - new PopStateEvent (SIMIX_get_clock(), container, type); + if (TRACE_smpi_is_enabled()) + smpi_container(rank)->getState("MPI_STATE")->popEvent(); } -void TRACE_smpi_ptp_in(int rank, const char *operation, instr_extra_data extra) +void TRACE_smpi_comm_in(int rank, const char* operation, simgrid::instr::TIData* extra) { if (not TRACE_smpi_is_enabled()) { - cleanup_extra_data(extra); + delete extra; return; } - char str[INSTR_DEFAULT_STR_SIZE]; - smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); - container_t container = PJ_container_get (str); - type_t type = PJ_type_get ("MPI_STATE", container->type); - const char *color = instr_find_color (operation); - value* val = value::get_or_new(operation, color, type); - new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast(extra)); + simgrid::instr::StateType* state = smpi_container(rank)->getState("MPI_STATE"); + state->addEntityValue(operation, instr_find_color(operation)); + state->pushEvent(operation, extra); } -void TRACE_smpi_ptp_out(int rank, int dst, const char *operation) +void TRACE_smpi_comm_out(int rank) { - if (not TRACE_smpi_is_enabled()) - return; - - char str[INSTR_DEFAULT_STR_SIZE]; - smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); - container_t container = PJ_container_get (str); - type_t type = PJ_type_get ("MPI_STATE", container->type); - - new PopStateEvent (SIMIX_get_clock(), container, type); + if (TRACE_smpi_is_enabled()) + smpi_container(rank)->getState("MPI_STATE")->popEvent(); } void TRACE_smpi_send(int rank, int src, int dst, int tag, int size) @@ -399,15 +267,10 @@ void TRACE_smpi_send(int rank, int src, int dst, int tag, int size) if (not TRACE_smpi_is_enabled()) return; - char key[INSTR_DEFAULT_STR_SIZE] = {0}; - TRACE_smpi_get_key(src, dst, tag, key, INSTR_DEFAULT_STR_SIZE,1); + std::string key = TRACE_smpi_get_key(src, dst, tag, 1); - char str[INSTR_DEFAULT_STR_SIZE]; - smpi_container(src, str, INSTR_DEFAULT_STR_SIZE); - container_t container = PJ_container_get (str); - type_t type = PJ_type_get ("MPI_LINK", PJ_type_get_root()); - XBT_DEBUG("Send tracing from %d to %d, tag %d, with key %s", src, dst, tag, key); - new StartLinkEvent (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key, size); + 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); } void TRACE_smpi_recv(int src, int dst, int tag) @@ -415,13 +278,8 @@ void TRACE_smpi_recv(int src, int dst, int tag) if (not TRACE_smpi_is_enabled()) return; - char key[INSTR_DEFAULT_STR_SIZE] = {0}; - TRACE_smpi_get_key(src, dst, tag, key, INSTR_DEFAULT_STR_SIZE,0); + std::string key = TRACE_smpi_get_key(src, dst, tag, 0); - char str[INSTR_DEFAULT_STR_SIZE]; - smpi_container(dst, str, INSTR_DEFAULT_STR_SIZE); - container_t container = PJ_container_get (str); - type_t type = PJ_type_get ("MPI_LINK", PJ_type_get_root()); - XBT_DEBUG("Recv tracing from %d to %d, tag %d, with key %s", src, dst, tag, key); - new EndLinkEvent (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key); + 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); }