From d6cbc9d2e4b8730bcbc9e2812fe08655ab7d5c7d Mon Sep 17 00:00:00 2001 From: Christian Heinrich Date: Wed, 17 Jan 2018 23:51:49 +0100 Subject: [PATCH 1/1] [SMPI] C++ify smpi::Process mailboxnames --- src/smpi/internals/smpi_process.cpp | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/src/smpi/internals/smpi_process.cpp b/src/smpi/internals/smpi_process.cpp index 93c117b3de..f5d50eaeac 100644 --- a/src/smpi/internals/smpi_process.cpp +++ b/src/smpi/internals/smpi_process.cpp @@ -12,23 +12,10 @@ #include "src/mc/mc_replay.hpp" #include "src/msg/msg_private.hpp" #include "src/simix/smx_private.hpp" +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_process, smpi, "Logging specific to SMPI (kernel)"); -#define MAILBOX_NAME_MAXLEN (5 + sizeof(int) * 2 + 1) - -static char* get_mailbox_name(char* str, int process_id) -{ - snprintf(str, MAILBOX_NAME_MAXLEN, "SMPI-%0*x", static_cast(sizeof(int) * 2), static_cast(process_id)); - return str; -} - -static char* get_mailbox_name_small(char* str, int process_id) -{ - snprintf(str, MAILBOX_NAME_MAXLEN, "small%0*x", static_cast(sizeof(int) * 2), static_cast(process_id)); - return str; -} - namespace simgrid{ namespace smpi{ @@ -38,10 +25,12 @@ using simgrid::s4u::ActorPtr; Process::Process(ActorPtr actor, msg_bar_t finalization_barrier) : finalization_barrier_(finalization_barrier) { - char name[MAILBOX_NAME_MAXLEN]; + std::stringstream mailboxname, mailboxname_small; process_ = actor; - mailbox_ = simgrid::s4u::Mailbox::byName(get_mailbox_name(name, process_->getPid())); - mailbox_small_ = simgrid::s4u::Mailbox::byName(get_mailbox_name_small(name, process_->getPid())); + mailboxname << std::string("SMPI-") << process_->getPid(); + mailboxname_small << std::string("small-") << process_->getPid(); + mailbox_ = simgrid::s4u::Mailbox::byName(mailboxname.str()); + mailbox_small_ = simgrid::s4u::Mailbox::byName(mailboxname_small.str()); mailboxes_mutex_ = xbt_mutex_init(); timer_ = xbt_os_timer_new(); state_ = SMPI_UNINITIALIZED; -- 2.20.1