X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c540b8009e2e13d461ecaa7cf17f68950b3539fb..bcb5cde966bef9e174da1c93cdb2158c0880a613:/src/smpi/instr_smpi.cpp diff --git a/src/smpi/instr_smpi.cpp b/src/smpi/instr_smpi.cpp index 4079b4cd81..eb3b1410a0 100644 --- a/src/smpi/instr_smpi.cpp +++ b/src/smpi/instr_smpi.cpp @@ -1,14 +1,15 @@ -/* Copyright (c) 2010, 2012-2015. The SimGrid Team. +/* Copyright (c) 2010, 2012-2017. 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 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI"); @@ -60,24 +61,24 @@ static const char *smpi_colors[] ={ static char *str_tolower (const char *str) { - char *ret = xbt_strdup (str); - int i, n = strlen (ret); - for (i = 0; i < n; i++) + 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 *instr_find_color (const char *state) { - char *target = str_tolower (state); - const char *ret = nullptr; - unsigned int i = 0; - const char *current = smpi_colors[i]; - while ((current != nullptr)){ + char* target = str_tolower(state); + 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; + ret = smpi_colors[i+1]; + break; } i+=2; current = smpi_colors[i]; @@ -92,21 +93,15 @@ XBT_PRIVATE char *smpi_container(int rank, char *container, int n) return container; } -static char *TRACE_smpi_get_key(int src, int dst, char *key, int n); +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, char *key, int n) +static char *TRACE_smpi_put_key(int src, int dst, int tag, char *key, int n, int send) { //get the dynar for src#dst char aux[INSTR_DEFAULT_STR_SIZE]; - snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d", src, dst); + 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(xbt_dynar_is_empty(d) == 0){ - //receive was already pushed, perform a get instead - TRACE_smpi_get_key(src , dst, key ,n); - return key; - } - if (d == nullptr) { d = xbt_dynar_new(sizeof(char *), &xbt_free_ref); xbt_dict_set(keys, aux, d, nullptr); @@ -115,7 +110,7 @@ static char *TRACE_smpi_put_key(int src, int dst, char *key, int n) //generate the key static unsigned long long counter = 0; counter++; - snprintf(key, n, "%d_%d_%llu", src, dst, counter); + snprintf(key, n, "%d_%d_%d_%llu", src, dst, tag, counter); //push it char *a = static_cast (xbt_strdup(key)); @@ -124,15 +119,15 @@ static char *TRACE_smpi_put_key(int src, int dst, char *key, int n) return key; } -static char *TRACE_smpi_get_key(int src, int dst, char *key, int n) +static char *TRACE_smpi_get_key(int src, int dst, int tag, char *key, int n, int send) { char aux[INSTR_DEFAULT_STR_SIZE]; - snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d", src, dst); + 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)); - // sometimes the receive may be posted before the send + // first posted if(xbt_dynar_is_empty(d)){ - TRACE_smpi_put_key(src, dst, key, n); + TRACE_smpi_put_key(src, dst, tag, key, n, send); return key; } @@ -156,7 +151,7 @@ static void cleanup_extra_data (instr_extra_data extra){ void TRACE_internal_smpi_set_category (const char *category) { - if (!TRACE_smpi_is_enabled()) + if (not TRACE_smpi_is_enabled()) return; //declare category @@ -170,9 +165,9 @@ void TRACE_internal_smpi_set_category (const char *category) 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()) + if (not TRACE_smpi_is_enabled()) return nullptr; char processid[INSTR_DEFAULT_STR_SIZE]; @@ -186,7 +181,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); @@ -194,7 +189,7 @@ void TRACE_smpi_release(void) void TRACE_smpi_init(int rank) { - if (!TRACE_smpi_is_enabled()) + if (not TRACE_smpi_is_enabled()) return; char str[INSTR_DEFAULT_STR_SIZE]; @@ -202,18 +197,34 @@ void TRACE_smpi_init(int rank) container_t father; if (TRACE_smpi_is_grouped()){ - father = PJ_container_get (SIMIX_host_self_get_name()); + father = PJ_container_get(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__); - 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) { - if (!TRACE_smpi_is_enabled()) + if (not TRACE_smpi_is_enabled()) return; char str[INSTR_DEFAULT_STR_SIZE]; @@ -224,9 +235,9 @@ void TRACE_smpi_finalize(int rank) void TRACE_smpi_collective_in(int rank, int root, const char *operation, instr_extra_data extra) { - if (!TRACE_smpi_is_enabled()) { - cleanup_extra_data(extra); - return; + if (not TRACE_smpi_is_enabled()) { + cleanup_extra_data(extra); + return; } char str[INSTR_DEFAULT_STR_SIZE]; @@ -235,12 +246,12 @@ void TRACE_smpi_collective_in(int rank, int root, const char *operation, instr_e type_t type = PJ_type_get ("MPI_STATE", container->type); const char *color = instr_find_color (operation); val_t value = PJ_value_get_or_new (operation, color, type); - new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value, static_cast(extra)); + new PushStateEvent (SIMIX_get_clock(), container, type, value, static_cast(extra)); } void TRACE_smpi_collective_out(int rank, int root, const char *operation) { - if (!TRACE_smpi_is_enabled()) + if (not TRACE_smpi_is_enabled()) return; char str[INSTR_DEFAULT_STR_SIZE]; @@ -248,30 +259,30 @@ void TRACE_smpi_collective_out(int rank, int root, const char *operation) container_t container = PJ_container_get (str); type_t type = PJ_type_get ("MPI_STATE", container->type); - new_pajePopState (SIMIX_get_clock(), container, type); + new PopStateEvent (SIMIX_get_clock(), container, type); } void TRACE_smpi_computing_init(int rank) { //first use, initialize the color in the trace - if (!TRACE_smpi_is_enabled() || !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 = PJ_value_get_or_new ("computing", color, type); - new_pajePushState (SIMIX_get_clock(), container, type, value); + 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 = PJ_value_get_or_new("computing", color, type); + new PushStateEvent(SIMIX_get_clock(), container, type, value); } void TRACE_smpi_computing_in(int rank, instr_extra_data extra) { //do not forget to set the color first, otherwise this will explode - if (!TRACE_smpi_is_enabled()|| !TRACE_smpi_is_computing()) { - cleanup_extra_data(extra); - return; + if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_computing()) { + cleanup_extra_data(extra); + return; } char str[INSTR_DEFAULT_STR_SIZE]; @@ -279,24 +290,24 @@ void TRACE_smpi_computing_in(int rank, instr_extra_data extra) 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", nullptr, type); - new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value, static_cast(extra)); + new PushStateEvent (SIMIX_get_clock(), container, type, value, static_cast(extra)); } void TRACE_smpi_computing_out(int rank) { - if (!TRACE_smpi_is_enabled()|| !TRACE_smpi_is_computing()) + 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_pajePopState (SIMIX_get_clock(), container, type); + new PopStateEvent (SIMIX_get_clock(), container, type); } void TRACE_smpi_sleeping_init(int rank) { //first use, initialize the color in the trace - if (!TRACE_smpi_is_enabled() || !TRACE_smpi_is_sleeping()) + if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_sleeping()) return; char str[INSTR_DEFAULT_STR_SIZE]; @@ -305,15 +316,15 @@ void TRACE_smpi_sleeping_init(int rank) type_t type = PJ_type_get ("MPI_STATE", container->type); const char *color = instr_find_color ("sleeping"); val_t value = PJ_value_get_or_new ("sleeping", color, type); - new_pajePushState (SIMIX_get_clock(), container, type, value); + new PushStateEvent (SIMIX_get_clock(), container, type, value); } void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra) { //do not forget to set the color first, otherwise this will explode - if (!TRACE_smpi_is_enabled()|| !TRACE_smpi_is_sleeping()) { - cleanup_extra_data(extra); - return; + if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_sleeping()) { + cleanup_extra_data(extra); + return; } char str[INSTR_DEFAULT_STR_SIZE]; @@ -321,26 +332,26 @@ void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra) 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", nullptr, type); - new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value, static_cast(extra)); + new PushStateEvent (SIMIX_get_clock(), container, type, value, static_cast(extra)); } void TRACE_smpi_sleeping_out(int rank) { - if (!TRACE_smpi_is_enabled()|| !TRACE_smpi_is_sleeping()) + 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_pajePopState (SIMIX_get_clock(), container, type); + new PopStateEvent (SIMIX_get_clock(), container, type); } void TRACE_smpi_testing_in(int rank, instr_extra_data extra) { //do not forget to set the color first, otherwise this will explode - if (!TRACE_smpi_is_enabled()) { - cleanup_extra_data(extra); - return; + if (not TRACE_smpi_is_enabled()) { + cleanup_extra_data(extra); + return; } char str[INSTR_DEFAULT_STR_SIZE]; @@ -348,25 +359,25 @@ void TRACE_smpi_testing_in(int rank, instr_extra_data extra) 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", nullptr, type); - new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value, static_cast(extra)); + new PushStateEvent (SIMIX_get_clock(), container, type, value, static_cast(extra)); } void TRACE_smpi_testing_out(int rank) { - if (!TRACE_smpi_is_enabled()) + 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_pajePopState (SIMIX_get_clock(), container, type); + new PopStateEvent (SIMIX_get_clock(), container, type); } void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation, instr_extra_data extra) { - if (!TRACE_smpi_is_enabled()) { - cleanup_extra_data(extra); - return; + if (not TRACE_smpi_is_enabled()) { + cleanup_extra_data(extra); + return; } char str[INSTR_DEFAULT_STR_SIZE]; @@ -375,12 +386,12 @@ void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation, instr_ type_t type = PJ_type_get ("MPI_STATE", container->type); const char *color = instr_find_color (operation); val_t value = PJ_value_get_or_new (operation, color, type); - new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value, static_cast(extra)); + new PushStateEvent (SIMIX_get_clock(), container, type, value, static_cast(extra)); } void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation) { - if (!TRACE_smpi_is_enabled()) + if (not TRACE_smpi_is_enabled()) return; char str[INSTR_DEFAULT_STR_SIZE]; @@ -388,37 +399,37 @@ void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation) container_t container = PJ_container_get (str); type_t type = PJ_type_get ("MPI_STATE", container->type); - new_pajePopState (SIMIX_get_clock(), container, type); + new PopStateEvent (SIMIX_get_clock(), container, type); } -void TRACE_smpi_send(int rank, int src, int dst, int size) +void TRACE_smpi_send(int rank, int src, int dst, int tag, int size) { - if (!TRACE_smpi_is_enabled()) + if (not TRACE_smpi_is_enabled()) return; char key[INSTR_DEFAULT_STR_SIZE] = {0}; - TRACE_smpi_put_key(src, dst, key, INSTR_DEFAULT_STR_SIZE); + TRACE_smpi_get_key(src, dst, tag, key, INSTR_DEFAULT_STR_SIZE,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()); - - new_pajeStartLinkWithSize (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); + new StartLinkEvent (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key, size); } -void TRACE_smpi_recv(int rank, int src, int dst) +void TRACE_smpi_recv(int rank, int src, int dst, int tag) { - if (!TRACE_smpi_is_enabled()) + if (not TRACE_smpi_is_enabled()) return; char key[INSTR_DEFAULT_STR_SIZE] = {0}; - TRACE_smpi_get_key(src, dst, key, INSTR_DEFAULT_STR_SIZE); + TRACE_smpi_get_key(src, dst, tag, key, INSTR_DEFAULT_STR_SIZE,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()); - - new_pajeEndLink (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); + new EndLinkEvent (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key); }