A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sonar don't like comments ending with ';'
[simgrid.git]
/
src
/
smpi
/
bindings
/
smpi_pmpi.cpp
diff --git
a/src/smpi/bindings/smpi_pmpi.cpp
b/src/smpi/bindings/smpi_pmpi.cpp
index
da15d37
..
6e635fa
100644
(file)
--- a/
src/smpi/bindings/smpi_pmpi.cpp
+++ b/
src/smpi/bindings/smpi_pmpi.cpp
@@
-37,13
+37,11
@@
int PMPI_Init(int *argc, char ***argv)
if(already_init == 0){
simgrid::smpi::Process::init(argc, argv);
smpi_process()->mark_as_initialized();
if(already_init == 0){
simgrid::smpi::Process::init(argc, argv);
smpi_process()->mark_as_initialized();
- int rank = s
mpi_process()->index
();
+ int rank = s
imgrid::s4u::Actor::self()->getPid
();
TRACE_smpi_init(rank);
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);
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, __FUNCTION__, extra);
- TRACE_smpi_collective_out(rank, __FUNCTION__);
smpi_bench_begin();
}
smpi_bench_begin();
}
@@
-55,15
+53,13
@@
int PMPI_Init(int *argc, char ***argv)
int PMPI_Finalize()
{
smpi_bench_end();
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, __FUNCTION__, extra);
+ int rank = simgrid::s4u::Actor::self()->getPid();
+ TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("finalize"));
smpi_process()->finalize();
smpi_process()->finalize();
- TRACE_smpi_co
llective_out(rank, __FUNCTION__
);
- TRACE_smpi_finalize(
smpi_process()->index()
);
+ TRACE_smpi_co
mm_out(rank
);
+ TRACE_smpi_finalize(
rank
);
return MPI_SUCCESS;
}
return MPI_SUCCESS;
}
@@
-88,7
+84,7
@@
int PMPI_Get_library_version (char *version,int *len){
return MPI_SUCCESS;
}
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;
{
if (provided != nullptr) {
*provided = MPI_THREAD_SINGLE;
@@
-108,15
+104,18
@@
int PMPI_Query_thread(int *provided)
int PMPI_Is_thread_main(int *flag)
{
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 {
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;
}
}
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
{
smpi_bench_end();
// FIXME: should kill all processes in comm instead
@@
-186,7
+185,8
@@
int PMPI_Initialized(int* flag) {
return MPI_SUCCESS;
}
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;
void *ptr = xbt_malloc(size);
if(ptr==nullptr)
return MPI_ERR_NO_MEM;