X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48eb2f1b9262fc74f527816c348ed2aa6efa9f65..5f1dc33c9f76ee99973ba93f034f031451398ebe:/src/smpi/internals/instr_smpi.cpp diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp index ec33a27bc8..69ffcb27b3 100644 --- a/src/smpi/internals/instr_smpi.cpp +++ b/src/smpi/internals/instr_smpi.cpp @@ -9,11 +9,12 @@ #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 const& elm : keys) + delete elm.second; } void TRACE_smpi_init(int rank) @@ -206,17 +199,17 @@ void TRACE_smpi_init(int rank) #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(), nullptr, container->type_); } } #endif @@ -230,7 +223,7 @@ void TRACE_smpi_finalize(int rank) 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); + delete container; } void TRACE_smpi_collective_in(int rank, const char *operation, instr_extra_data extra) @@ -243,10 +236,10 @@ void TRACE_smpi_collective_in(int rank, const char *operation, instr_extra_data 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); + simgrid::instr::Type* type = container->type_->getChild("MPI_STATE"); 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::Value* val = simgrid::instr::Value::get_or_new(operation, color, type); + new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast(extra)); } void TRACE_smpi_collective_out(int rank, const char *operation) @@ -257,9 +250,9 @@ void TRACE_smpi_collective_out(int rank, const char *operation) 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); + simgrid::instr::Type* type = container->type_->getChild("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) @@ -271,9 +264,10 @@ void TRACE_smpi_computing_init(int rank) 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); + simgrid::instr::Type* type = container->type_->getChild("MPI_STATE"); const char* color = instr_find_color("computing"); - new PushStateEvent(SIMIX_get_clock(), container, type, value::get_or_new("computing", color, type)); + new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, + simgrid::instr::Value::get_or_new("computing", color, type)); } void TRACE_smpi_computing_in(int rank, instr_extra_data extra) @@ -287,9 +281,9 @@ void TRACE_smpi_computing_in(int rank, instr_extra_data extra) 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)); + simgrid::instr::Type* type = container->type_->getChild("MPI_STATE"); + simgrid::instr::Value* val = simgrid::instr::Value::get_or_new("computing", nullptr, type); + new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast(extra)); } void TRACE_smpi_computing_out(int rank) @@ -299,8 +293,8 @@ void TRACE_smpi_computing_out(int rank) 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); + simgrid::instr::Type* type = container->type_->getChild("MPI_STATE"); + new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type); } void TRACE_smpi_sleeping_init(int rank) @@ -312,10 +306,10 @@ void TRACE_smpi_sleeping_init(int rank) 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); + simgrid::instr::Type* type = container->type_->getChild("MPI_STATE"); const char *color = instr_find_color ("sleeping"); - value* val = value::get_or_new("sleeping", color, type); - new PushStateEvent(SIMIX_get_clock(), container, type, val); + simgrid::instr::Value* val = simgrid::instr::Value::get_or_new("sleeping", color, type); + new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val); } void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra) @@ -329,9 +323,9 @@ void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra) 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)); + simgrid::instr::Type* type = container->type_->getChild("MPI_STATE"); + simgrid::instr::Value* val = simgrid::instr::Value::get_or_new("sleeping", nullptr, type); + new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast(extra)); } void TRACE_smpi_sleeping_out(int rank) @@ -341,8 +335,8 @@ void TRACE_smpi_sleeping_out(int rank) 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); + simgrid::instr::Type* type = container->type_->getChild("MPI_STATE"); + new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type); } void TRACE_smpi_testing_in(int rank, instr_extra_data extra) @@ -356,9 +350,9 @@ void TRACE_smpi_testing_in(int rank, instr_extra_data extra) 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::Type* type = container->type_->getChild("MPI_STATE"); + simgrid::instr::Value* val = simgrid::instr::Value::get_or_new("test", nullptr, type); + new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast(extra)); } void TRACE_smpi_testing_out(int rank) @@ -368,8 +362,8 @@ void TRACE_smpi_testing_out(int rank) 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); + simgrid::instr::Type* type = container->type_->getChild("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) @@ -382,10 +376,10 @@ void TRACE_smpi_ptp_in(int rank, const char *operation, instr_extra_data extra) 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); + simgrid::instr::Type* type = container->type_->getChild("MPI_STATE"); 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::Value* val = simgrid::instr::Value::get_or_new(operation, color, type); + new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast(extra)); } void TRACE_smpi_ptp_out(int rank, int dst, const char *operation) @@ -396,9 +390,9 @@ void TRACE_smpi_ptp_out(int rank, int dst, const char *operation) 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); + simgrid::instr::Type* type = container->type_->getChild("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) @@ -412,9 +406,9 @@ void TRACE_smpi_send(int rank, int src, int dst, int tag, int size) 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()); + simgrid::instr::Type* type = PJ_type_get_root()->getChild("MPI_LINK"); 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); + 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) @@ -428,7 +422,7 @@ void TRACE_smpi_recv(int src, int dst, int tag) 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()); + simgrid::instr::Type* type = PJ_type_get_root()->getChild("MPI_LINK"); 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); + new simgrid::instr::EndLinkEvent(SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key); }