From 52063c65b7ec032fc26be3891ad425a63c0e8d52 Mon Sep 17 00:00:00 2001 From: Christian Heinrich Date: Wed, 21 Mar 2018 16:50:36 +0100 Subject: [PATCH] [SMPI] Deployment: Move function signatures to std::string Except for the SMPI_app_instance_register, as it is part of the (C-)API. --- src/smpi/include/private.hpp | 7 ++++--- src/smpi/internals/smpi_deployment.cpp | 13 +++++++------ src/smpi/internals/smpi_global.cpp | 4 ++-- src/smpi/internals/smpi_process.cpp | 4 ++-- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp index bf9b287d5a..7eebf7a743 100644 --- a/src/smpi/include/private.hpp +++ b/src/smpi/include/private.hpp @@ -65,9 +65,10 @@ XBT_PRIVATE SMPI_Process* smpi_process(); XBT_PRIVATE SMPI_Process* smpi_process_remote(simgrid::s4u::ActorPtr actor); XBT_PRIVATE int smpi_process_count(); -XBT_PRIVATE void smpi_deployment_register_process(const char* instance_id, int rank, simgrid::s4u::ActorPtr actor); -XBT_PRIVATE MPI_Comm* smpi_deployment_comm_world(const char* instance_id); -XBT_PRIVATE msg_bar_t smpi_deployment_finalization_barrier(const char* instance_id); +XBT_PRIVATE void smpi_deployment_register_process(const std::string instance_id, int rank, + simgrid::s4u::ActorPtr actor); +XBT_PRIVATE MPI_Comm* smpi_deployment_comm_world(const std::string instance_id); +XBT_PRIVATE msg_bar_t smpi_deployment_finalization_barrier(const std::string instance_id); XBT_PRIVATE void smpi_deployment_cleanup_instances(); XBT_PRIVATE void smpi_comm_copy_buffer_callback(smx_activity_t comm, void* buff, size_t buff_size); diff --git a/src/smpi/internals/smpi_deployment.cpp b/src/smpi/internals/smpi_deployment.cpp index ad05eae729..34bdf94ec9 100644 --- a/src/smpi/internals/smpi_deployment.cpp +++ b/src/smpi/internals/smpi_deployment.cpp @@ -17,7 +17,8 @@ namespace app { class Instance { public: - Instance(const char* name, int max_no_processes, int process_count, MPI_Comm comm, msg_bar_t finalization_barrier) + Instance(const std::string name, int max_no_processes, int process_count, MPI_Comm comm, + msg_bar_t finalization_barrier) : name(name) , size(max_no_processes) , present_processes(0) @@ -25,7 +26,7 @@ public: , finalization_barrier(finalization_barrier) { } - const char* name; + const std::string name; int size; int present_processes; MPI_Comm comm_world; @@ -63,7 +64,7 @@ void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_ } } - Instance instance(name, num_processes, process_count, MPI_COMM_NULL, MSG_barrier_init(num_processes)); + Instance instance(std::string(name), num_processes, process_count, MPI_COMM_NULL, MSG_barrier_init(num_processes)); MPI_Group group = new simgrid::smpi::Group(instance.size); instance.comm_world = new simgrid::smpi::Comm(group, nullptr); MPI_Attr_put(instance.comm_world, MPI_UNIVERSE_SIZE, reinterpret_cast(instance.size)); @@ -73,7 +74,7 @@ void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_ smpi_instances.insert(std::pair(name, instance)); } -void smpi_deployment_register_process(const char* instance_id, int rank, simgrid::s4u::ActorPtr actor) +void smpi_deployment_register_process(const std::string instance_id, int rank, simgrid::s4u::ActorPtr actor) { if (smpi_instances.empty()) // no instance registered, we probably used smpirun. return; @@ -84,7 +85,7 @@ void smpi_deployment_register_process(const char* instance_id, int rank, simgrid instance.comm_world->group()->set_mapping(actor, rank); } -MPI_Comm* smpi_deployment_comm_world(const char* instance_id) +MPI_Comm* smpi_deployment_comm_world(const std::string instance_id) { if (smpi_instances.empty()) { // no instance registered, we probably used smpirun. return nullptr; @@ -93,7 +94,7 @@ MPI_Comm* smpi_deployment_comm_world(const char* instance_id) return &instance.comm_world; } -msg_bar_t smpi_deployment_finalization_barrier(const char* instance_id) +msg_bar_t smpi_deployment_finalization_barrier(const std::string instance_id) { if (smpi_instances.empty()) { // no instance registered, we probably used smpirun. return nullptr; diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index f75d237792..cd07e11517 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -78,7 +78,7 @@ MPI_Errhandler *MPI_ERRORS_ARE_FATAL = nullptr; MPI_Errhandler *MPI_ERRHANDLER_NULL = nullptr; // No instance gets manually created; check also the smpirun.in script as // this default name is used there as well (when the tag is generated). -static const char* smpi_default_instance_name = "smpirun"; +static const std::string smpi_default_instance_name("smpirun"); static simgrid::config::Flag smpi_wtime_sleep( "smpi/wtime", "Minimum time to inject inside a call to MPI_Wtime", 0.0); static simgrid::config::Flag smpi_init_sleep( @@ -565,7 +565,7 @@ int smpi_main(const char* executable, int argc, char *argv[]) SMPI_init(); SIMIX_launch_application(argv[2]); - SMPI_app_instance_register(smpi_default_instance_name, nullptr, + SMPI_app_instance_register(smpi_default_instance_name.c_str(), nullptr, process_data.size()); // This call has a side effect on process_count... MPI_COMM_WORLD = *smpi_deployment_comm_world(smpi_default_instance_name); smpi_universe_size = process_count; diff --git a/src/smpi/internals/smpi_process.cpp b/src/smpi/internals/smpi_process.cpp index fc8e8e153e..dc1c516a1b 100644 --- a/src/smpi/internals/smpi_process.cpp +++ b/src/smpi/internals/smpi_process.cpp @@ -63,8 +63,8 @@ Process::~Process() void Process::set_data(int* argc, char*** argv) { instance_id_ = std::string((*argv)[1]); - comm_world_ = smpi_deployment_comm_world(instance_id_.c_str()); - msg_bar_t barrier = smpi_deployment_finalization_barrier(instance_id_.c_str()); + comm_world_ = smpi_deployment_comm_world(instance_id_); + msg_bar_t barrier = smpi_deployment_finalization_barrier(instance_id_); if (barrier != nullptr) // don't overwrite the current one if the instance has none finalization_barrier_ = barrier; -- 2.20.1