X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/de5e36cc7e45014c43cf9290b5ac8380072d69ad..50048ea494302c3030b44964627044c74a85a66c:/src/smpi/instr_smpi.cpp diff --git a/src/smpi/instr_smpi.cpp b/src/smpi/instr_smpi.cpp index 36ee8d52aa..ee21f420d6 100644 --- a/src/smpi/instr_smpi.cpp +++ b/src/smpi/instr_smpi.cpp @@ -5,10 +5,11 @@ * 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 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI"); @@ -55,7 +56,7 @@ static const char *smpi_colors[] ={ "win_wait", "1 0.8 0", "win_start", "0.8 0 1", "win_complete", "0.8 1 0", - NULL, NULL, + nullptr, nullptr, }; static char *str_tolower (const char *str) @@ -70,10 +71,10 @@ static char *str_tolower (const char *str) static const char *instr_find_color (const char *state) { char *target = str_tolower (state); - const char *ret = NULL; + const char *ret = nullptr; unsigned int i = 0; const char *current = smpi_colors[i]; - while ((current != NULL)){ + while ((current != nullptr)){ if (strcmp (state, current) == 0 //exact match || strstr(target, current) != 0 ){//as substring ret = smpi_colors[i+1]; @@ -107,9 +108,9 @@ static char *TRACE_smpi_put_key(int src, int dst, char *key, int n) return key; } - if (d == NULL) { + if (d == nullptr) { d = xbt_dynar_new(sizeof(char *), &xbt_free_ref); - xbt_dict_set(keys, aux, d, NULL); + xbt_dict_set(keys, aux, d, nullptr); } //generate the key @@ -138,17 +139,17 @@ static char *TRACE_smpi_get_key(int src, int dst, char *key, int n) char *s = xbt_dynar_get_as (d, 0, char *); snprintf (key, n, "%s", s); - xbt_dynar_remove_at (d, 0, NULL); + xbt_dynar_remove_at (d, 0, nullptr); return key; } static xbt_dict_t process_category; static void cleanup_extra_data (instr_extra_data extra){ - if(extra!=NULL){ - if(extra->sendcounts!=NULL) + if(extra!=nullptr){ + if(extra->sendcounts!=nullptr) xbt_free(extra->sendcounts); - if(extra->recvcounts!=NULL) + if(extra->recvcounts!=nullptr) xbt_free(extra->recvcounts); xbt_free(extra); } @@ -166,14 +167,14 @@ void TRACE_internal_smpi_set_category (const char *category) 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 != NULL) - xbt_dict_set (process_category, processid, xbt_strdup(category), NULL); + if (category != nullptr) + xbt_dict_set (process_category, processid, xbt_strdup(category), nullptr); } -const char *TRACE_internal_smpi_get_category (void) +const char *TRACE_internal_smpi_get_category () { if (!TRACE_smpi_is_enabled()) - return NULL; + return nullptr; char processid[INSTR_DEFAULT_STR_SIZE]; snprintf (processid, INSTR_DEFAULT_STR_SIZE, "%p", SIMIX_process_self()); @@ -186,7 +187,7 @@ void TRACE_smpi_alloc() process_category = xbt_dict_new_homogeneous(xbt_free_f); } -void TRACE_smpi_release(void) +void TRACE_smpi_release() { xbt_dict_free(&keys); xbt_dict_free(&process_category); @@ -206,9 +207,25 @@ void TRACE_smpi_init(int rank) }else{ father = PJ_container_get_root (); } - xbt_assert(father!=NULL, + xbt_assert(father!=nullptr, "Could not find a parent for mpi rank %s at function %s", str, __FUNCTION__); - PJ_container_new(str, INSTR_SMPI, father); +#if HAVE_PAPI + container_t container = +#endif + PJ_container_new(str, INSTR_SMPI, father); +#if HAVE_PAPI + papi_counter_t counters = smpi_process_papi_counters(); + + for (auto& 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); + } + } +#endif } void TRACE_smpi_finalize(int rank) @@ -278,7 +295,7 @@ void TRACE_smpi_computing_in(int rank, instr_extra_data extra) 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 = PJ_value_get_or_new ("computing", NULL, type); + val_t value = PJ_value_get_or_new ("computing", nullptr, type); new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value, static_cast(extra)); } @@ -320,7 +337,7 @@ void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra) 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 = PJ_value_get_or_new ("sleeping", NULL, type); + val_t value = PJ_value_get_or_new ("sleeping", nullptr, type); new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value, static_cast(extra)); } @@ -347,7 +364,7 @@ void TRACE_smpi_testing_in(int rank, instr_extra_data extra) 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 = PJ_value_get_or_new ("test", NULL, type); + val_t value = PJ_value_get_or_new ("test", nullptr, type); new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value, static_cast(extra)); } @@ -403,7 +420,7 @@ void TRACE_smpi_send(int rank, int src, int dst, int 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, with key %s", src, dst, key); new_pajeStartLinkWithSize (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key, size); } @@ -419,6 +436,6 @@ void TRACE_smpi_recv(int rank, int src, int dst) 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, with key %s", src, dst, key); new_pajeEndLink (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key); }