X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a821dea495f4a5d0087871302e4d21ee3ba9b61f..4d9809aa64447811ca65a1242d4f9e07972c6472:/src/smpi/bindings/smpi_pmpi.cpp diff --git a/src/smpi/bindings/smpi_pmpi.cpp b/src/smpi/bindings/smpi_pmpi.cpp index 7954c147f1..76da5cd4c3 100644 --- a/src/smpi/bindings/smpi_pmpi.cpp +++ b/src/smpi/bindings/smpi_pmpi.cpp @@ -8,9 +8,9 @@ #include "simgrid/s4u/Host.hpp" #include "smpi_comm.hpp" #include "smpi_datatype_derived.hpp" -#include "smpi_process.hpp" #include "smpi_status.hpp" #include "src/simix/ActorImpl.hpp" +#include "src/smpi/include/smpi_actor.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_pmpi, smpi, "Logging specific to SMPI (pmpi)"); @@ -19,7 +19,8 @@ void TRACE_smpi_set_category(const char *category) { //need to end bench otherwise categories for execution tasks are wrong smpi_bench_end(); - TRACE_internal_smpi_set_category (category); + if (category != nullptr) + TRACE_internal_smpi_set_category(category); //begin bench after changing process's category smpi_bench_begin(); } @@ -28,20 +29,22 @@ void TRACE_smpi_set_category(const char *category) int PMPI_Init(int *argc, char ***argv) { - xbt_assert(simgrid::s4u::Engine::isInitialized(), + xbt_assert(simgrid::s4u::Engine::is_initialized(), "Your MPI program was not properly initialized. The easiest is to use smpirun to start it."); - // PMPI_Init is called only once per SMPI process - int already_init; - MPI_Initialized(&already_init); - if(already_init == 0){ - simgrid::smpi::Process::init(argc, argv); - smpi_process()->mark_as_initialized(); - int rank = simgrid::s4u::Actor::self()->getPid(); - TRACE_smpi_init(rank); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("init")); - TRACE_smpi_comm_out(rank); - TRACE_smpi_computing_init(rank); + + // Init is called only once per SMPI process + if (not smpi_process()->initializing()){ + simgrid::smpi::ActorExt::init(); + } + if (not smpi_process()->initialized()){ + int rank_traced = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_init(rank_traced); + TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::NoOpTIData("init")); + TRACE_smpi_comm_out(rank_traced); + TRACE_smpi_computing_init(rank_traced); + TRACE_smpi_sleeping_init(rank_traced); smpi_bench_begin(); + smpi_process()->mark_as_initialized(); } smpi_mpi_init(); @@ -52,13 +55,13 @@ int PMPI_Init(int *argc, char ***argv) int PMPI_Finalize() { smpi_bench_end(); - int rank = simgrid::s4u::Actor::self()->getPid(); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("finalize")); + int rank_traced = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::NoOpTIData("finalize")); smpi_process()->finalize(); - TRACE_smpi_comm_out(rank); - TRACE_smpi_finalize(rank); + TRACE_smpi_comm_out(rank_traced); + TRACE_smpi_finalize(rank_traced); return MPI_SUCCESS; } @@ -76,7 +79,7 @@ int PMPI_Get_version (int *version,int *subversion){ int PMPI_Get_library_version (char *version,int *len){ smpi_bench_end(); - snprintf(version, MPI_MAX_LIBRARY_VERSION_STRING, "SMPI Version %d.%d. Copyright The Simgrid Team 2007-2017", + snprintf(version, MPI_MAX_LIBRARY_VERSION_STRING, "SMPI Version %d.%d. Copyright The Simgrid Team 2007-2018", SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR); *len = strlen(version) > MPI_MAX_LIBRARY_VERSION_STRING ? MPI_MAX_LIBRARY_VERSION_STRING : strlen(version); smpi_bench_begin(); @@ -108,8 +111,9 @@ int PMPI_Is_thread_main(int *flag) if (flag == nullptr) { return MPI_ERR_ARG; } else { - *flag = simgrid::s4u::Actor::self()->getPid() == 1; // FIXME: I don't think this is correct: This just returns true if the process ID is 1, - // regardless of whether this process called MPI_Thread_Init() or not. + *flag = simgrid::s4u::this_actor::get_pid() == + 1; // FIXME: I don't think this is correct: This just returns true if the process ID is 1, + // regardless of whether this process called MPI_Thread_Init() or not. return MPI_SUCCESS; } } @@ -119,7 +123,7 @@ int PMPI_Abort(MPI_Comm /*comm*/, int /*errorcode*/) smpi_bench_end(); // FIXME: should kill all processes in comm instead smx_actor_t process = SIMIX_process_self(); - simgrid::simix::kernelImmediate([process] { SIMIX_process_kill(process, process); }); + simgrid::simix::simcall([process] { SIMIX_process_kill(process, process); }); return MPI_SUCCESS; } @@ -151,9 +155,9 @@ int PMPI_Get_address(void *location, MPI_Aint * address) int PMPI_Get_processor_name(char *name, int *resultlen) { - strncpy(name, sg_host_self()->getCname(), strlen(sg_host_self()->getCname()) < MPI_MAX_PROCESSOR_NAME - 1 - ? strlen(sg_host_self()->getCname()) + 1 - : MPI_MAX_PROCESSOR_NAME - 1); + strncpy(name, sg_host_self()->get_cname(), + strlen(sg_host_self()->get_cname()) < MPI_MAX_PROCESSOR_NAME - 1 ? strlen(sg_host_self()->get_cname()) + 1 + : MPI_MAX_PROCESSOR_NAME - 1); *resultlen = strlen(name) > MPI_MAX_PROCESSOR_NAME ? MPI_MAX_PROCESSOR_NAME : strlen(name); return MPI_SUCCESS; @@ -206,9 +210,22 @@ int PMPI_Error_class(int errorcode, int* errorclass) { return MPI_SUCCESS; } +int PMPI_Error_string(int errorcode, char* string, int* resultlen){ + if (errorcode<0 || string ==nullptr){ + return MPI_ERR_ARG; + } else { + static const char *smpi_error_string[] = { + FOREACH_ERROR(GENERATE_STRING) + }; + *resultlen = strlen(smpi_error_string[errorcode]); + strncpy(string, smpi_error_string[errorcode], *resultlen); + return MPI_SUCCESS; + } +} + int PMPI_Keyval_create(MPI_Copy_function* copy_fn, MPI_Delete_function* delete_fn, int* keyval, void* extra_state) { - smpi_copy_fn _copy_fn={copy_fn,nullptr,nullptr}; - smpi_delete_fn _delete_fn={delete_fn,nullptr,nullptr}; + smpi_copy_fn _copy_fn={copy_fn,nullptr,nullptr,nullptr,nullptr,nullptr}; + smpi_delete_fn _delete_fn={delete_fn,nullptr,nullptr,nullptr,nullptr,nullptr}; return simgrid::smpi::Keyval::keyval_create(_copy_fn, _delete_fn, keyval, extra_state); }