X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07fa4dbf48f51edfee6c6a56c11095b02e93bf5e..3c40b1bfc4f4925fa401d3b5d0c74a4b4824b3d5:/src/smpi/internals/smpi_global.cpp diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 4ba19caf85..afabcb8aaf 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -8,6 +8,7 @@ #include "private.hpp" #include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/Mailbox.hpp" +#include "simgrid/s4u/forward.hpp" #include "smpi_coll.hpp" #include "smpi_comm.hpp" #include "smpi_group.hpp" @@ -50,9 +51,11 @@ struct papi_process_data { }; #endif +using simgrid::s4u::Actor; +using simgrid::s4u::ActorPtr; std::unordered_map location2speedup; -static std::map process_data; +static std::map process_data; int process_count = 0; int smpi_universe_size = 0; extern double smpi_total_benched_time; @@ -81,10 +84,9 @@ static simgrid::config::Flag smpi_init_sleep( void (*smpi_comm_copy_data_callback) (smx_activity_t, void*, size_t) = &smpi_comm_copy_buffer_callback; -void smpi_add_process(int smx_process) +void smpi_add_process(ActorPtr actor) { - process_data.insert( - std::pair(smx_process, new simgrid::smpi::Process(smx_process, nullptr))); + process_data.insert({actor, new simgrid::smpi::Process(actor, nullptr)}); } int smpi_process_count() @@ -94,16 +96,16 @@ int smpi_process_count() simgrid::smpi::Process* smpi_process() { - smx_actor_t me = SIMIX_process_self(); + ActorPtr me = Actor::self(); if (me == nullptr) // This happens sometimes (eg, when linking against NS3 because it pulls openMPI...) return nullptr; - simgrid::msg::ActorExt* msgExt = static_cast(me->userdata); + simgrid::msg::ActorExt* msgExt = static_cast(me->getImpl()->userdata); return static_cast(msgExt->data); } -simgrid::smpi::Process* smpi_process_remote(int index) +simgrid::smpi::Process* smpi_process_remote(ActorPtr actor) { - return process_data.at(index); + return process_data.at(actor); } MPI_Comm smpi_process_comm_self(){ @@ -115,7 +117,7 @@ void smpi_process_init(int *argc, char ***argv){ } int smpi_process_index(){ - return smpi_process()->index(); + return simgrid::s4u::Actor::self()->getPid(); } void * smpi_process_get_user_data(){ @@ -194,9 +196,7 @@ void smpi_comm_copy_buffer_callback(smx_activity_t synchro, void *buff, size_t b (static_cast(buff) < smpi_data_exe_start + smpi_data_exe_size)) { XBT_DEBUG("Privatization : We are copying from a zone inside global memory... Saving data to temp buffer !"); - smpi_switch_data_segment( - static_cast((static_cast(comm->src_proc->userdata)->data)) - ->index()); + smpi_switch_data_segment(Actor::self()->getPid()); tmpbuff = static_cast(xbt_malloc(buff_size)); memcpy_private(tmpbuff, buff, private_blocks); } @@ -204,9 +204,7 @@ void smpi_comm_copy_buffer_callback(smx_activity_t synchro, void *buff, size_t b if ((smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) && ((char*)comm->dst_buff >= smpi_data_exe_start) && ((char*)comm->dst_buff < smpi_data_exe_start + smpi_data_exe_size)) { XBT_DEBUG("Privatization : We are copying to a zone inside global memory - Switch data segment"); - smpi_switch_data_segment( - static_cast((static_cast(comm->dst_proc->userdata)->data)) - ->index()); + smpi_switch_data_segment(Actor::self()->getPid()); } XBT_DEBUG("Copying %zu bytes from %p to %p", buff_size, tmpbuff,comm->dst_buff); memcpy_private(comm->dst_buff, tmpbuff, private_blocks); @@ -344,14 +342,6 @@ void smpi_global_init() } } #endif - - if (process_count == 0) { // The program has been dispatched but no other - // SMPI instances have been registered. We're using smpirun. - SMPI_app_instance_register(smpi_default_instance_name, nullptr, - SIMIX_process_count()); // 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; } void smpi_global_destroy() @@ -487,6 +477,9 @@ int smpi_main(const char* executable, int argc, char *argv[]) SMPI_switch_data_segment = &smpi_switch_data_segment; + // TODO This will not be executed in the case where smpi_main is not called, + // e.g., not for smpi_msg_masterslave. This should be moved to another location + // that is always called -- maybe close to Actor::onCreation? simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) { host.extension_set(new simgrid::smpi::SmpiHost(&host)); }); @@ -496,7 +489,6 @@ int smpi_main(const char* executable, int argc, char *argv[]) SIMIX_comm_set_copy_data_callback(smpi_comm_copy_buffer_callback); smpi_init_options(); - if (smpi_privatize_global_variables == SMPI_PRIVATIZE_DLOPEN) { std::string executable_copy = executable; @@ -585,9 +577,13 @@ 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, + SIMIX_process_count()); // 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; - SMPI_init(); /* Clean IO before the run */ fflush(stdout); @@ -613,9 +609,10 @@ int smpi_main(const char* executable, int argc, char *argv[]) } } int ret = 0; - for (int i = 0, count = smpi_process_count(); i < count; i++) { - if (process_data.at(i)->return_value() != 0) { - ret = process_data.at(i)->return_value(); // return first non 0 value + for (auto& pair : process_data) { + auto& smpi_process = pair.second; + if (smpi_process->return_value() != 0) { + ret = smpi_process->return_value(); // return first non 0 value break; } } @@ -628,6 +625,16 @@ int smpi_main(const char* executable, int argc, char *argv[]) // Called either directly from the user code, or from the code called by smpirun void SMPI_init(){ + simgrid::s4u::Actor::onCreation.connect([](simgrid::s4u::ActorPtr actor) { + smpi_add_process(actor); + }); + simgrid::s4u::Actor::onDestruction.connect([](simgrid::s4u::ActorPtr actor) { + if (process_data.find(actor) != process_data.end()) { + delete process_data.at(actor); + process_data.erase(actor); + } + }); + smpi_init_options(); smpi_global_init(); smpi_check_options();