X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2a4e09ea802d88e54d4c8b29d9bd57f72d5b2760..3d0628fad8839386cf9e51aaf5169c5fff570df6:/src/smpi/bindings/smpi_pmpi.cpp diff --git a/src/smpi/bindings/smpi_pmpi.cpp b/src/smpi/bindings/smpi_pmpi.cpp index a891002291..3a85c23419 100644 --- a/src/smpi/bindings/smpi_pmpi.cpp +++ b/src/smpi/bindings/smpi_pmpi.cpp @@ -1,15 +1,16 @@ -/* 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. */ +#include "private.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" -#include "private.h" #include "smpi_comm.hpp" #include "smpi_datatype_derived.hpp" #include "smpi_process.hpp" #include "smpi_status.hpp" +#include "src/simix/ActorImpl.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_pmpi, smpi, "Logging specific to SMPI (pmpi)"); @@ -24,7 +25,6 @@ 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) { @@ -36,13 +36,11 @@ 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::Actor::self()->getPid(); TRACE_smpi_init(rank); + TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::NoOpTIData("init")); + TRACE_smpi_comm_out(rank); TRACE_smpi_computing_init(rank); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_INIT; - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); - TRACE_smpi_collective_out(rank, __FUNCTION__); smpi_bench_begin(); } @@ -54,15 +52,13 @@ int PMPI_Init(int *argc, char ***argv) int PMPI_Finalize() { smpi_bench_end(); - int rank = smpi_process()->index(); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_FINALIZE; - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); + int rank = simgrid::s4u::Actor::self()->getPid(); + TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::NoOpTIData("finalize")); smpi_process()->finalize(); - TRACE_smpi_collective_out(rank, __FUNCTION__); - TRACE_smpi_finalize(smpi_process()->index()); + TRACE_smpi_comm_out(rank); + TRACE_smpi_finalize(rank); return MPI_SUCCESS; } @@ -87,7 +83,7 @@ int PMPI_Get_library_version (char *version,int *len){ return MPI_SUCCESS; } -int PMPI_Init_thread(int *argc, char ***argv, int required, int *provided) +int PMPI_Init_thread(int* argc, char*** argv, int /*required*/, int* provided) { if (provided != nullptr) { *provided = MPI_THREAD_SINGLE; @@ -107,19 +103,23 @@ 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::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. return MPI_SUCCESS; } } -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 - simcall_process_kill(SIMIX_process_self()); + smx_actor_t process = SIMIX_process_self(); + simgrid::simix::kernelImmediate([process] { SIMIX_process_kill(process, process); }); return MPI_SUCCESS; } @@ -184,7 +184,8 @@ int PMPI_Initialized(int* flag) { return MPI_SUCCESS; } -int PMPI_Alloc_mem(MPI_Aint size, MPI_Info info, void *baseptr){ +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; @@ -214,5 +215,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"