X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c8b5ad951425eec2af7c59d39d4231ef7f3f1c9d..13d441fdabaa1ce8765fdee7ee61c83253dfa123:/src/smpi/bindings/smpi_pmpi.cpp diff --git a/src/smpi/bindings/smpi_pmpi.cpp b/src/smpi/bindings/smpi_pmpi.cpp index 52dcf73c97..c92f7e472d 100644 --- a/src/smpi/bindings/smpi_pmpi.cpp +++ b/src/smpi/bindings/smpi_pmpi.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. 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. */ @@ -25,11 +25,10 @@ void TRACE_smpi_set_category(const char *category) } /* PMPI User level calls */ -extern "C" { // Obviously, the C MPI interface should use the C linkage 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; @@ -37,11 +36,12 @@ int PMPI_Init(int *argc, char ***argv) if(already_init == 0){ simgrid::smpi::Process::init(argc, argv); smpi_process()->mark_as_initialized(); - int rank = smpi_process()->index(); + int rank = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_init(rank); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("init")); + TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::NoOpTIData("init")); TRACE_smpi_comm_out(rank); TRACE_smpi_computing_init(rank); + TRACE_smpi_sleeping_init(rank); smpi_bench_begin(); } @@ -53,8 +53,8 @@ int PMPI_Init(int *argc, char ***argv) int PMPI_Finalize() { smpi_bench_end(); - int rank = smpi_process()->index(); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("finalize")); + int rank = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::NoOpTIData("finalize")); smpi_process()->finalize(); @@ -77,7 +77,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(); @@ -104,10 +104,14 @@ int PMPI_Query_thread(int *provided) int PMPI_Is_thread_main(int *flag) { + // FIXME: The MPI standard seems to say that fatal errors need to be triggered + // if MPI has been finalized or not yet been initialized if (flag == nullptr) { return MPI_ERR_ARG; } else { - *flag = smpi_process()->index() == 0; + *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; } } @@ -117,7 +121,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; } @@ -149,9 +153,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; @@ -204,6 +208,38 @@ int PMPI_Error_class(int errorcode, int* errorclass) { return MPI_SUCCESS; } +int PMPI_Error_string(int errorcode, char* string, int* resultlen){ +//TODO: put this somewhere else ? + const char* smpi_error_strings[] { + "MPI_SUCCESS","MPI_ERR_COMM","MPI_ERR_ARG","MPI_ERR_TYPE","MPI_ERR_REQUEST", + "MPI_ERR_INTERN","MPI_ERR_COUNT","MPI_ERR_RANK","MPI_ERR_TAG", + "MPI_ERR_TRUNCATE","MPI_ERR_GROUP","MPI_ERR_OP","MPI_ERR_OTHER", + "MPI_ERR_IN_STATUS","MPI_ERR_PENDING","MPI_ERR_BUFFER","MPI_ERR_NAME", + "MPI_ERR_DIMS","MPI_ERR_TOPOLOGY","MPI_ERR_NO_MEM","MPI_ERR_WIN", + "MPI_ERR_INFO_VALUE","MPI_ERR_INFO_KEY","MPI_ERR_INFO_NOKEY","MPI_ERR_ROOT", + "MPI_ERR_UNKNOWN","MPI_ERR_KEYVAL","MPI_ERR_BASE","MPI_ERR_SPAWN", + "MPI_ERR_PORT","MPI_ERR_SERVICE","MPI_ERR_SIZE","MPI_ERR_DISP","MPI_ERR_INFO", + "MPI_ERR_LOCKTYPE","MPI_ERR_ASSERT","MPI_RMA_CONFLICT","MPI_RMA_SYNC", + "MPI_ERR_FILE","MPI_ERR_NOT_SAME","MPI_ERR_AMODE","MPI_ERR_UNSUPPORTED_DATAREP", + "MPI_ERR_UNSUPPORTED_OPERATION","MPI_ERR_NO_SUCH_FILE","MPI_ERR_FILE_EXISTS", + "MPI_ERR_BAD_FILE","MPI_ERR_ACCESS","MPI_ERR_NO_SPACE","MPI_ERR_QUOTA", + "MPI_ERR_READ_ONLY","MPI_ERR_FILE_IN_USE","MPI_ERR_DUP_DATAREP", + "MPI_ERR_CONVERSION","MPI_ERR_IO","MPI_ERR_RMA_ATTACH","MPI_ERR_RMA_CONFLICT", + "MPI_ERR_RMA_RANGE","MPI_ERR_RMA_SHARED","MPI_ERR_RMA_SYNC", + "MPI_ERR_RMA_FLAVOR","MPI_T_ERR_CANNOT_INIT","MPI_T_ERR_NOT_INITIALIZED", + "MPI_T_ERR_MEMORY","MPI_T_ERR_INVALID_INDEX","MPI_T_ERR_INVALID_ITEM", + "MPI_T_ERR_INVALID_SESSION","MPI_T_ERR_INVALID_HANDLE", + "MPI_T_ERR_OUT_OF_HANDLES","MPI_T_ERR_OUT_OF_SESSIONS", + "MPI_T_ERR_CVAR_SET_NOT_NOW","MPI_T_ERR_CVAR_SET_NEVER", + "MPI_T_ERR_PVAR_NO_WRITE","MPI_T_ERR_PVAR_NO_STARTSTOP", + "MPI_T_ERR_PVAR_NO_ATOMIC" + }; + + *resultlen = strlen(smpi_error_strings[errorcode]); + strncpy(string, smpi_error_strings[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}; @@ -213,5 +249,3 @@ 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); } - -} // extern "C"