X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a470be169558c63bccfb87761d482d90421d979a..39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f:/src/smpi/bindings/smpi_pmpi.cpp?ds=sidebyside diff --git a/src/smpi/bindings/smpi_pmpi.cpp b/src/smpi/bindings/smpi_pmpi.cpp index 6b831d51df..4a07b91a80 100644 --- a/src/smpi/bindings/smpi_pmpi.cpp +++ b/src/smpi/bindings/smpi_pmpi.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -7,6 +7,7 @@ #include "simgrid/instr.h" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" +#include "simgrid/version.h" #include "smpi_comm.hpp" #include "smpi_datatype_derived.hpp" #include "smpi_status.hpp" @@ -31,25 +32,19 @@ void TRACE_smpi_set_category(const char *category) /* PMPI User level calls */ -int PMPI_Init(int *argc, char ***argv) +int PMPI_Init(int*, char***) { xbt_assert(simgrid::s4u::Engine::is_initialized(), "Your MPI program was not properly initialized. The easiest is to use smpirun to start it."); - // 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(); - } + xbt_assert(not smpi_process()->initializing()); + xbt_assert(not smpi_process()->initialized()); + + simgrid::smpi::ActorExt::init(); + int rank_traced = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_init(rank_traced, __func__); + smpi_bench_begin(); + smpi_process()->mark_as_initialized(); smpi_mpi_init(); @@ -65,7 +60,6 @@ int PMPI_Finalize() smpi_process()->finalize(); TRACE_smpi_comm_out(rank_traced); - TRACE_smpi_finalize(rank_traced); return MPI_SUCCESS; } @@ -82,11 +76,9 @@ 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-2019", + snprintf(version, MPI_MAX_LIBRARY_VERSION_STRING, "SMPI Version %d.%d. Copyright The SimGrid Team 2007-2021", SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR); *len = strlen(version) > MPI_MAX_LIBRARY_VERSION_STRING ? MPI_MAX_LIBRARY_VERSION_STRING : strlen(version); - smpi_bench_begin(); return MPI_SUCCESS; } @@ -126,8 +118,9 @@ int PMPI_Abort(MPI_Comm /*comm*/, int /*errorcode*/) { smpi_bench_end(); // FIXME: should kill all processes in comm instead + XBT_WARN("MPI_Abort was called, something went probably wrong in this simulation ! Killing this process"); smx_actor_t actor = SIMIX_process_self(); - simgrid::simix::simcall([actor] { actor->exit(); }); + simgrid::kernel::actor::simcall([actor] { actor->exit(); }); return MPI_SUCCESS; } @@ -142,7 +135,7 @@ double PMPI_Wtick() return sg_maxmin_precision; } -int PMPI_Address(void *location, MPI_Aint * address) +int PMPI_Address(const void* location, MPI_Aint* address) { if (address==nullptr) { return MPI_ERR_ARG; @@ -152,22 +145,22 @@ int PMPI_Address(void *location, MPI_Aint * address) } } -int PMPI_Get_address(void *location, MPI_Aint * address) +int PMPI_Get_address(const void *location, MPI_Aint * address) { return PMPI_Address(location, address); } int PMPI_Get_processor_name(char *name, int *resultlen) { - 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); + int len = std::min(sg_host_self()->get_name().size(), MPI_MAX_PROCESSOR_NAME - 1); + std::string(sg_host_self()->get_name()).copy(name, len); + name[len] = '\0'; + *resultlen = len; return MPI_SUCCESS; } -int PMPI_Get_count(MPI_Status * status, MPI_Datatype datatype, int *count) +int PMPI_Get_count(const MPI_Status * status, MPI_Datatype datatype, int *count) { if (status == nullptr || count == nullptr) { return MPI_ERR_ARG; @@ -195,12 +188,8 @@ int PMPI_Initialized(int* flag) { int PMPI_Alloc_mem(MPI_Aint size, MPI_Info /*info*/, void* baseptr) { void *ptr = xbt_malloc(size); - if(ptr==nullptr) - return MPI_ERR_NO_MEM; - else { - *static_cast(baseptr) = ptr; - return MPI_SUCCESS; - } + *static_cast(baseptr) = ptr; + return MPI_SUCCESS; } int PMPI_Free_mem(void *baseptr){ @@ -214,17 +203,15 @@ int PMPI_Error_class(int errorcode, int* errorclass) { return MPI_SUCCESS; } -int PMPI_Error_string(int errorcode, char* string, int* resultlen){ - if (errorcode<0 || errorcode>= MPI_MAX_ERROR_STRING || string ==nullptr){ +int PMPI_Error_string(int errorcode, char* string, int* resultlen) +{ + static const std::vector smpi_error_string = {FOREACH_ERROR(GENERATE_STRING)}; + if (errorcode < 0 || static_cast(errorcode) >= smpi_error_string.size() || 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 len = snprintf(string, MPI_MAX_ERROR_STRING, "%s", smpi_error_string[errorcode]); + *resultlen = std::min(len, MPI_MAX_ERROR_STRING - 1); + return MPI_SUCCESS; } int PMPI_Keyval_create(MPI_Copy_function* copy_fn, MPI_Delete_function* delete_fn, int* keyval, void* extra_state) { @@ -236,3 +223,30 @@ int PMPI_Keyval_create(MPI_Copy_function* copy_fn, MPI_Delete_function* delete_f int PMPI_Keyval_free(int* keyval) { return simgrid::smpi::Keyval::keyval_free(keyval); } + +MPI_Errhandler PMPI_Errhandler_f2c(MPI_Fint errhan){ + if(errhan==-1) + return MPI_ERRHANDLER_NULL; + return simgrid::smpi::Errhandler::f2c(errhan); +} + +MPI_Fint PMPI_Errhandler_c2f(MPI_Errhandler errhan){ + if(errhan==MPI_ERRHANDLER_NULL) + return -1; + return errhan->c2f(); +} + +int PMPI_Buffer_attach(void *buf, int size){ + if(buf==nullptr) + return MPI_ERR_BUFFER; + if(size<0) + return MPI_ERR_ARG; + smpi_process()->set_bsend_buffer(buf, size); + return MPI_SUCCESS; +} + +int PMPI_Buffer_detach(void* buffer, int* size){ + smpi_process()->bsend_buffer((void**)buffer, size); + smpi_process()->set_bsend_buffer(nullptr, 0); + return MPI_SUCCESS; +}