X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d7344bf4cd4b75fe33e19f2ac1994b200962aa7e..dd89cc2577e61b4b86b1ae7bc58dfa2ad00747e6:/src/smpi/internals/instr_smpi.cpp diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp index 0eeccfa8da..581f87fabb 100644 --- a/src/smpi/internals/instr_smpi.cpp +++ b/src/smpi/internals/instr_smpi.cpp @@ -4,140 +4,106 @@ /* 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 -#include -#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI"); -static xbt_dict_t 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", + + "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 const char *instr_find_color (const char *state) +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 std::string smpi_container(int rank) { - snprintf(container, n, "rank-%d", rank); - return container; + return 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); - xbt_dynar_t d = static_cast(xbt_dict_get_or_null(keys, aux)); - - if (d == nullptr) { - d = xbt_dynar_new(sizeof(char *), &xbt_free_ref); - xbt_dict_set(keys, aux, d, nullptr); - } + // 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; + + if (it == keys.end()) { + d = new std::deque; + keys[aux] = d; + } else + d = it->second; //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 - char *a = static_cast (xbt_strdup(key)); - xbt_dynar_push_as(d, char *, a); + d->push_back(key); 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); - xbt_dynar_t d = static_cast(xbt_dict_get_or_null(keys, aux)); - - // first posted - if(xbt_dynar_is_empty(d)){ - TRACE_smpi_put_key(src, dst, tag, key, n, send); - return key; + 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 + key = TRACE_smpi_put_key(src, dst, tag, send); + } else { + key = it->second->front(); + it->second->pop_front(); } - - char *s = xbt_dynar_get_as (d, 0, char *); - snprintf (key, n, "%s", s); - xbt_dynar_remove_at (d, 0, nullptr); return key; } -static xbt_dict_t process_category; +static std::unordered_map process_category; static void cleanup_extra_data (instr_extra_data extra){ if(extra!=nullptr){ @@ -157,12 +123,8 @@ void TRACE_internal_smpi_set_category (const char *category) //declare category TRACE_category (category); - char processid[INSTR_DEFAULT_STR_SIZE]; - snprintf (processid, INSTR_DEFAULT_STR_SIZE, "%p", SIMIX_process_self()); - if (xbt_dict_get_or_null (process_category, processid)) - xbt_dict_remove (process_category, processid); if (category != nullptr) - xbt_dict_set (process_category, processid, xbt_strdup(category), nullptr); + process_category[SIMIX_process_self()] = category; } const char *TRACE_internal_smpi_get_category () @@ -170,21 +132,19 @@ const char *TRACE_internal_smpi_get_category () if (not TRACE_smpi_is_enabled()) return nullptr; - char processid[INSTR_DEFAULT_STR_SIZE]; - snprintf (processid, INSTR_DEFAULT_STR_SIZE, "%p", SIMIX_process_self()); - return static_cast(xbt_dict_get_or_null (process_category, processid)); + auto it = process_category.find(SIMIX_process_self()); + return (it == process_category.end()) ? nullptr : it->second.c_str(); } void TRACE_smpi_alloc() { - keys = xbt_dict_new_homogeneous(xbt_dynar_free_voidp); - process_category = xbt_dict_new_homogeneous(xbt_free_f); + // for symmetry } void TRACE_smpi_release() { - xbt_dict_free(&keys); - xbt_dict_free(&process_category); + for (auto const& elm : keys) + delete elm.second; } void TRACE_smpi_init(int rank) @@ -192,31 +152,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 = smpi_container(rank); container_t father; if (TRACE_smpi_is_grouped()){ - father = PJ_container_get(sg_host_self_get_name()); + father = simgrid::instr::Container::byName(sg_host_self_get_name()); }else{ father = PJ_container_get_root (); } - 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, simgrid::instr::INSTR_SMPI, 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 (PJ_type_get_or_null(it.first.c_str(), container->type) == nullptr) { - PJ_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 @@ -227,10 +185,9 @@ 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); + container_t container = simgrid::instr::Container::byName(smpi_container(rank)); + container->removeFromParent(); + delete container; } void TRACE_smpi_collective_in(int rank, const char *operation, instr_extra_data extra) @@ -240,13 +197,12 @@ void TRACE_smpi_collective_in(int rank, const char *operation, instr_extra_data 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); + container_t container = simgrid::instr::Container::byName(smpi_container(rank)); + simgrid::instr::Type* type = container->type_->byName("MPI_STATE"); const char *color = instr_find_color (operation); - val_t value = s_val::PJ_value_get_or_new (operation, color, type); - new PushStateEvent (SIMIX_get_clock(), container, type, value, static_cast(extra)); + type->addEntityValue(operation, color); + new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, type->getEntityValue(operation), + static_cast(extra)); } void TRACE_smpi_collective_out(int rank, const char *operation) @@ -254,12 +210,10 @@ 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); + container_t container = simgrid::instr::Container::byName(smpi_container(rank)); + simgrid::instr::Type* type = container->type_->byName("MPI_STATE"); - new PopStateEvent (SIMIX_get_clock(), container, type); + new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type); } void TRACE_smpi_computing_init(int rank) @@ -268,13 +222,10 @@ void TRACE_smpi_computing_init(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); - const char* color = instr_find_color("computing"); - val_t value = s_val::PJ_value_get_or_new("computing", color, type); - new PushStateEvent(SIMIX_get_clock(), container, type, value); + container_t container = simgrid::instr::Container::byName(smpi_container(rank)); + simgrid::instr::Type* type = container->type_->byName("MPI_STATE"); + type->addEntityValue("computing", instr_find_color("computing")); + new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, type->getEntityValue("computing")); } void TRACE_smpi_computing_in(int rank, instr_extra_data extra) @@ -285,23 +236,21 @@ void TRACE_smpi_computing_in(int rank, instr_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); - val_t value = s_val::PJ_value_get_or_new ("computing", nullptr, type); - new PushStateEvent (SIMIX_get_clock(), container, type, value, static_cast(extra)); + container_t container = simgrid::instr::Container::byName(smpi_container(rank)); + simgrid::instr::Type* type = container->type_->byName("MPI_STATE"); + type->addEntityValue("computing"); + new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, type->getEntityValue("computing"), + static_cast(extra)); } 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); + + container_t container = simgrid::instr::Container::byName(smpi_container(rank)); + simgrid::instr::Type* type = container->type_->byName("MPI_STATE"); + new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type); } void TRACE_smpi_sleeping_init(int rank) @@ -310,13 +259,10 @@ void TRACE_smpi_sleeping_init(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); - const char *color = instr_find_color ("sleeping"); - val_t value = s_val::PJ_value_get_or_new ("sleeping", color, type); - new PushStateEvent (SIMIX_get_clock(), container, type, value); + container_t container = simgrid::instr::Container::byName(smpi_container(rank)); + simgrid::instr::Type* state = container->type_->byName("MPI_STATE"); + state->addEntityValue("sleeping", instr_find_color("sleeping")); + new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue("sleeping")); } void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra) @@ -327,23 +273,21 @@ void TRACE_smpi_sleeping_in(int rank, instr_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); - val_t value = s_val::PJ_value_get_or_new ("sleeping", nullptr, type); - new PushStateEvent (SIMIX_get_clock(), container, type, value, static_cast(extra)); + container_t container = simgrid::instr::Container::byName(smpi_container(rank)); + simgrid::instr::Type* state = container->type_->byName("MPI_STATE"); + state->addEntityValue("sleeping"); + new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue("sleeping"), + static_cast(extra)); } 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); + + container_t container = simgrid::instr::Container::byName(smpi_container(rank)); + simgrid::instr::Type* type = container->type_->byName("MPI_STATE"); + new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type); } void TRACE_smpi_testing_in(int rank, instr_extra_data extra) @@ -354,23 +298,21 @@ void TRACE_smpi_testing_in(int rank, instr_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); - val_t value = s_val::PJ_value_get_or_new ("test", nullptr, type); - new PushStateEvent (SIMIX_get_clock(), container, type, value, static_cast(extra)); + container_t container = simgrid::instr::Container::byName(smpi_container(rank)); + simgrid::instr::Type* state = container->type_->byName("MPI_STATE"); + state->addEntityValue("test"); + new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue("test"), + static_cast(extra)); } 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); + + container_t container = simgrid::instr::Container::byName(smpi_container(rank)); + simgrid::instr::Type* type = container->type_->byName("MPI_STATE"); + new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type); } void TRACE_smpi_ptp_in(int rank, const char *operation, instr_extra_data extra) @@ -380,13 +322,11 @@ void TRACE_smpi_ptp_in(int rank, const char *operation, instr_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); - val_t value = s_val::PJ_value_get_or_new (operation, color, type); - new PushStateEvent (SIMIX_get_clock(), container, type, value, static_cast(extra)); + container_t container = simgrid::instr::Container::byName(smpi_container(rank)); + simgrid::instr::Type* state = container->type_->byName("MPI_STATE"); + state->addEntityValue(operation, instr_find_color(operation)); + new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue(operation), + static_cast(extra)); } void TRACE_smpi_ptp_out(int rank, int dst, const char *operation) @@ -394,12 +334,10 @@ void TRACE_smpi_ptp_out(int rank, int dst, 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); + container_t container = simgrid::instr::Container::byName(smpi_container(rank)); + simgrid::instr::Type* type = container->type_->byName("MPI_STATE"); - new PopStateEvent (SIMIX_get_clock(), container, type); + new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type); } void TRACE_smpi_send(int rank, int src, int dst, int tag, int size) @@ -407,15 +345,12 @@ 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); + container_t container = simgrid::instr::Container::byName(smpi_container(rank)); + simgrid::instr::Type* type = simgrid::instr::Type::getRootType()->byName("MPI_LINK"); + XBT_DEBUG("Send tracing from %d to %d, tag %d, with key %s", src, dst, tag, key.c_str()); + new simgrid::instr::StartLinkEvent(SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key, size); } void TRACE_smpi_recv(int src, int dst, int tag) @@ -423,13 +358,10 @@ 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); + container_t container = simgrid::instr::Container::byName(smpi_container(dst)); + simgrid::instr::Type* type = simgrid::instr::Type::getRootType()->byName("MPI_LINK"); + XBT_DEBUG("Recv tracing from %d to %d, tag %d, with key %s", src, dst, tag, key.c_str()); + new simgrid::instr::EndLinkEvent(SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key); }