X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b9625f82f86db0674e911887addce45dca31b57f..f807f3ecd43bd280674b57f277d3af275fbfbaa5:/src/smpi/bindings/smpi_pmpi.cpp diff --git a/src/smpi/bindings/smpi_pmpi.cpp b/src/smpi/bindings/smpi_pmpi.cpp index 66346e8e01..744b0a37a9 100644 --- a/src/smpi/bindings/smpi_pmpi.cpp +++ b/src/smpi/bindings/smpi_pmpi.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2020. 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. */ @@ -37,8 +37,18 @@ 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."); - xbt_assert(not smpi_process()->initializing()); - xbt_assert(not smpi_process()->initialized()); + if(smpi_process()->initializing()){ + XBT_WARN("SMPI is already initializing - MPI_Init called twice ?"); + return MPI_ERR_OTHER; + } + if(smpi_process()->initialized()){ + XBT_WARN("SMPI already initialized once - MPI_Init called twice ?"); + return MPI_ERR_OTHER; + } + if(smpi_process()->finalized()){ + XBT_WARN("SMPI already finalized"); + return MPI_ERR_OTHER; + } simgrid::smpi::ActorExt::init(); int rank_traced = simgrid::s4u::this_actor::get_pid(); @@ -76,7 +86,7 @@ int PMPI_Get_version (int *version,int *subversion){ } int PMPI_Get_library_version (char *version,int *len){ - snprintf(version, MPI_MAX_LIBRARY_VERSION_STRING, "SMPI Version %d.%d. Copyright The SimGrid Team 2007-2020", + 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); return MPI_SUCCESS; @@ -114,13 +124,19 @@ int PMPI_Is_thread_main(int *flag) } } -int PMPI_Abort(MPI_Comm /*comm*/, int /*errorcode*/) +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::kernel::actor::simcall([actor] { actor->exit(); }); + CHECK_COMM(1) + XBT_WARN("MPI_Abort was called, something went probably wrong in this simulation ! Killing all processes sharing the same MPI_COMM_WORLD"); + smx_actor_t myself = SIMIX_process_self(); + for (int i = 0; i < comm->size(); i++){ + smx_actor_t actor = simgrid::kernel::actor::ActorImpl::by_pid(comm->group()->actor_pid(i)); + if (actor != nullptr && actor != myself) + simgrid::kernel::actor::simcall([actor] { actor->exit(); }); + } + // now ourself + simgrid::kernel::actor::simcall([myself] { myself->exit(); }); return MPI_SUCCESS; } @@ -150,12 +166,24 @@ int PMPI_Get_address(const void *location, MPI_Aint * address) return PMPI_Address(location, address); } +MPI_Aint PMPI_Aint_add(MPI_Aint address, MPI_Aint disp) +{ + xbt_assert(address <= PTRDIFF_MAX - disp, "overflow in MPI_Aint_add"); + return address + disp; +} + +MPI_Aint PMPI_Aint_diff(MPI_Aint address, MPI_Aint disp) +{ + xbt_assert(address >= PTRDIFF_MIN + disp, "underflow in MPI_Aint_diff"); + return address - disp; +} + 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; } @@ -170,13 +198,12 @@ int PMPI_Get_count(const MPI_Status * status, MPI_Datatype datatype, int *count) size_t size = datatype->size(); if (size == 0) { *count = 0; - return MPI_SUCCESS; } else if (status->count % size != 0) { - return MPI_UNDEFINED; + *count = MPI_UNDEFINED; } else { *count = simgrid::smpi::Status::get_count(status, datatype); - return MPI_SUCCESS; } + return MPI_SUCCESS; } } @@ -187,13 +214,10 @@ int PMPI_Initialized(int* flag) { int PMPI_Alloc_mem(MPI_Aint size, MPI_Info /*info*/, void* baseptr) { + CHECK_NEGATIVE(1, MPI_ERR_COUNT, size) 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){ @@ -209,9 +233,8 @@ int PMPI_Error_class(int errorcode, int* errorclass) { int PMPI_Error_string(int errorcode, char* string, int* resultlen) { - static const char* smpi_error_string[] = {FOREACH_ERROR(GENERATE_STRING)}; - constexpr int nerrors = (sizeof smpi_error_string) / (sizeof smpi_error_string[0]); - if (errorcode < 0 || errorcode >= nerrors || string == nullptr) + 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; int len = snprintf(string, MPI_MAX_ERROR_STRING, "%s", smpi_error_string[errorcode]); @@ -226,32 +249,20 @@ int PMPI_Keyval_create(MPI_Copy_function* copy_fn, MPI_Delete_function* delete_f } int PMPI_Keyval_free(int* keyval) { + CHECK_NULL(1, MPI_ERR_ARG, keyval) + CHECK_VAL(1, MPI_KEYVAL_INVALID, MPI_ERR_KEYVAL, *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; + return smpi_process()->set_bsend_buffer(buf, size); } 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; + return smpi_process()->set_bsend_buffer(nullptr, 0); }