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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[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
59561a4
..
52dcf73
100644
(file)
--- a/
src/smpi/bindings/smpi_pmpi.cpp
+++ b/
src/smpi/bindings/smpi_pmpi.cpp
@@
-3,7
+3,7
@@
/* 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. */
/* 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.h"
+#include "private.h
pp
"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "smpi_comm.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "smpi_comm.hpp"
@@
-39,11
+39,9
@@
int PMPI_Init(int *argc, char ***argv)
smpi_process()->mark_as_initialized();
int rank = smpi_process()->index();
TRACE_smpi_init(rank);
smpi_process()->mark_as_initialized();
int rank = smpi_process()->index();
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();
}
@@
-56,14
+54,12
@@
int PMPI_Finalize()
{
smpi_bench_end();
int rank = smpi_process()->index();
{
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);
+ 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;
@@
-116,7
+112,7
@@
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
{
smpi_bench_end();
// FIXME: should kill all processes in comm instead
@@
-186,7
+182,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;