X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1366b293e8c700b12567e45076cf0e6b7a25478f..0fe0d73074c511e5b95836551ab58e149737b58e:/src/smpi/internals/instr_smpi.cpp diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp index aca15f009c..9318b356fc 100644 --- a/src/smpi/internals/instr_smpi.cpp +++ b/src/smpi/internals/instr_smpi.cpp @@ -6,14 +6,15 @@ #include "private.h" #include "private.hpp" -#include +#include +#include +#include +#include #include -#include -#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI"); -static xbt_dict_t keys; +static std::unordered_map*> keys; static const char *smpi_colors[] ={ "recv", "1 0 0", @@ -100,12 +101,14 @@ static char *TRACE_smpi_put_key(int src, int dst, int tag, char *key, int n, int //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)); + auto it = keys.find(aux); + std::deque* d; - if (d == nullptr) { - d = xbt_dynar_new(sizeof(char *), &xbt_free_ref); - xbt_dict_set(keys, aux, d, nullptr); - } + if (it == keys.end()) { + d = new std::deque; + keys[aux] = d; + } else + d = it->second; //generate the key static unsigned long long counter = 0; @@ -113,8 +116,7 @@ static char *TRACE_smpi_put_key(int src, int dst, int tag, char *key, int n, int snprintf(key, n, "%d_%d_%d_%llu", src, dst, tag, counter); //push it - char *a = static_cast (xbt_strdup(key)); - xbt_dynar_push_as(d, char *, a); + d->push_back(key); return key; } @@ -123,21 +125,18 @@ static char *TRACE_smpi_get_key(int src, int dst, int tag, char *key, int n, int { 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; + auto it = keys.find(aux); + if (it == keys.end()) { + // first posted + TRACE_smpi_put_key(src, dst, tag, key, n, send); + } else { + snprintf(key, n, "%s", it->second->front().c_str()); + 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 +156,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 +165,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 elm : keys) + delete elm.second; } void TRACE_smpi_init(int rank) @@ -233,8 +226,8 @@ void TRACE_smpi_finalize(int rank) PJ_container_free (container); } -void TRACE_smpi_collective_in(int rank, int root, const char *operation, instr_extra_data extra) -{ paje_value pj_value; +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; @@ -245,11 +238,11 @@ void TRACE_smpi_collective_in(int rank, int root, const char *operation, instr_e 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 = pj_value.PJ_value_get_or_new (operation, color, type); - new PushStateEvent (SIMIX_get_clock(), container, type, value, static_cast(extra)); + 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, int root, const char *operation) +void TRACE_smpi_collective_out(int rank, const char *operation) { if (not TRACE_smpi_is_enabled()) return; @@ -263,7 +256,7 @@ void TRACE_smpi_collective_out(int rank, int root, const char *operation) } void TRACE_smpi_computing_init(int rank) -{ paje_value pj_value; +{ //first use, initialize the color in the trace if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_computing()) return; @@ -273,12 +266,11 @@ void TRACE_smpi_computing_init(int rank) 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.PJ_value_get_or_new("computing", color, type); - new PushStateEvent(SIMIX_get_clock(), container, type, value); + new PushStateEvent(SIMIX_get_clock(), container, type, value::get_or_new("computing", color, type)); } void TRACE_smpi_computing_in(int rank, instr_extra_data extra) -{ paje_value pj_value; +{ //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); @@ -289,8 +281,8 @@ 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.PJ_value_get_or_new ("computing", nullptr, type); - new PushStateEvent (SIMIX_get_clock(), container, type, value, static_cast(extra)); + value* val = value::get_or_new("computing", nullptr, type); + new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast(extra)); } void TRACE_smpi_computing_out(int rank) @@ -305,7 +297,7 @@ void TRACE_smpi_computing_out(int rank) } void TRACE_smpi_sleeping_init(int rank) -{ paje_value pj_value; +{ //first use, initialize the color in the trace if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_sleeping()) return; @@ -315,12 +307,12 @@ void TRACE_smpi_sleeping_init(int rank) 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 = pj_value.PJ_value_get_or_new ("sleeping", color, type); - new PushStateEvent (SIMIX_get_clock(), container, type, value); + value* val = value::get_or_new("sleeping", color, type); + new PushStateEvent(SIMIX_get_clock(), container, type, val); } void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra) -{ paje_value pj_value; +{ //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); @@ -331,8 +323,8 @@ 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.PJ_value_get_or_new ("sleeping", nullptr, type); - new PushStateEvent (SIMIX_get_clock(), container, type, value, static_cast(extra)); + value* val = value::get_or_new("sleeping", nullptr, type); + new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast(extra)); } void TRACE_smpi_sleeping_out(int rank) @@ -347,7 +339,7 @@ void TRACE_smpi_sleeping_out(int rank) } void TRACE_smpi_testing_in(int rank, instr_extra_data extra) -{ paje_value pj_value; +{ //do not forget to set the color first, otherwise this will explode if (not TRACE_smpi_is_enabled()) { cleanup_extra_data(extra); @@ -358,8 +350,8 @@ 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.PJ_value_get_or_new ("test", nullptr, type); - new PushStateEvent (SIMIX_get_clock(), container, type, value, static_cast(extra)); + value* val = value::get_or_new("test", nullptr, type); + new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast(extra)); } void TRACE_smpi_testing_out(int rank) @@ -373,8 +365,8 @@ void TRACE_smpi_testing_out(int rank) 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) -{ paje_value pj_value; +void TRACE_smpi_ptp_in(int rank, const char *operation, instr_extra_data extra) +{ if (not TRACE_smpi_is_enabled()) { cleanup_extra_data(extra); return; @@ -385,11 +377,11 @@ void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation, instr_ 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 = pj_value.PJ_value_get_or_new (operation, color, type); - new PushStateEvent (SIMIX_get_clock(), container, type, value, static_cast(extra)); + value* val = value::get_or_new(operation, color, type); + new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast(extra)); } -void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation) +void TRACE_smpi_ptp_out(int rank, int dst, const char *operation) { if (not TRACE_smpi_is_enabled()) return; @@ -418,7 +410,7 @@ void TRACE_smpi_send(int rank, int src, int dst, int tag, int size) new StartLinkEvent (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key, size); } -void TRACE_smpi_recv(int rank, int src, int dst, int tag) +void TRACE_smpi_recv(int src, int dst, int tag) { if (not TRACE_smpi_is_enabled()) return;