From: Christian Heinrich Date: Thu, 11 Jan 2018 23:22:01 +0000 (+0100) Subject: [SMPI] Update smpi_deployment_register_process for actors X-Git-Tag: v3.19~312^2~46 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/6b214e9de5705ca77332bab116b2f23dba415f50?ds=sidebyside [SMPI] Update smpi_deployment_register_process for actors --- diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp index 2112269d7b..b74967f124 100644 --- a/src/smpi/include/private.hpp +++ b/src/smpi/include/private.hpp @@ -65,7 +65,7 @@ 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, int index); +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_cleanup_instances(); diff --git a/src/smpi/internals/smpi_process.cpp b/src/smpi/internals/smpi_process.cpp index 792d2f6d28..dc764faaf9 100644 --- a/src/smpi/internals/smpi_process.cpp +++ b/src/smpi/internals/smpi_process.cpp @@ -283,7 +283,7 @@ void Process::init(int *argc, char ***argv){ char* instance_id = (*argv)[1]; try { int rank = std::stoi(std::string((*argv)[2])); - smpi_deployment_register_process(instance_id, rank, index); + smpi_deployment_register_process(instance_id, rank, proc); } catch (std::invalid_argument& ia) { throw std::invalid_argument(std::string("Invalid rank: ") + (*argv)[2]); }