X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5c33ef14a6c1c95ec3ebeeea0966bd28fdedf02e..84862a5ed2d967524594c4fee1369b3a91c490e3:/src/smpi/internals/instr_smpi.cpp diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp index c5a65d81c8..3f7fcd3fed 100644 --- a/src/smpi/internals/instr_smpi.cpp +++ b/src/smpi/internals/instr_smpi.cpp @@ -136,25 +136,25 @@ static std::string TRACE_smpi_get_key(int src, int dst, int tag, int send) static std::unordered_map process_category; -void TRACE_internal_smpi_set_category (const char *category) +void TRACE_internal_smpi_set_category(std::string category) { if (not TRACE_smpi_is_enabled()) return; //declare category - TRACE_category (category); + TRACE_category(category.c_str()); - if (category != nullptr) + if (not category.empty()) process_category[SIMIX_process_self()] = category; } -const char *TRACE_internal_smpi_get_category () +std::string TRACE_internal_smpi_get_category() { if (not TRACE_smpi_is_enabled()) - return nullptr; + return ""; auto it = process_category.find(SIMIX_process_self()); - return (it == process_category.end()) ? nullptr : it->second.c_str(); + return (it == process_category.end()) ? "" : it->second.c_str(); } void TRACE_smpi_setup_container(int rank, sg_host_t host) @@ -296,7 +296,7 @@ void TRACE_smpi_send_process_data_out(int rank) void TRACE_smpi_process_change_host(int rank, sg_host_t new_host) { - if (!TRACE_smpi_is_enabled()) return; + if (not TRACE_smpi_is_enabled()) return; /** The key is (most likely) used to match the events in the trace */ static long long int counter = 0;