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
yes another attempt
[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
ff6a248
..
b6dfc7e
100644
(file)
--- a/
src/smpi/bindings/smpi_pmpi.cpp
+++ b/
src/smpi/bindings/smpi_pmpi.cpp
@@
-1,15
+1,16
@@
-/* Copyright (c) 2007-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-201
8
. 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. */
/* 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 "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 "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)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_pmpi, smpi, "Logging specific to SMPI (pmpi)");
@@
-24,11
+25,10
@@
void TRACE_smpi_set_category(const char *category)
}
/* PMPI User level calls */
}
/* PMPI User level calls */
-extern "C" { // Obviously, the C MPI interface should use the C linkage
int PMPI_Init(int *argc, char ***argv)
{
int PMPI_Init(int *argc, char ***argv)
{
- xbt_assert(simgrid::s4u::Engine::is
I
nitialized(),
+ xbt_assert(simgrid::s4u::Engine::is
_i
nitialized(),
"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;
"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;
@@
-36,13
+36,12
@@
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::this_actor::get_pid
();
TRACE_smpi_init(rank);
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);
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__);
+ TRACE_smpi_sleeping_init(rank);
smpi_bench_begin();
}
smpi_bench_begin();
}
@@
-54,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::this_actor::get_pid();
+ TRACE_smpi_comm_in(rank, __func__, 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;
}
@@
-80,14
+77,14
@@
int PMPI_Get_version (int *version,int *subversion){
int PMPI_Get_library_version (char *version,int *len){
smpi_bench_end();
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-201
7
",
+ snprintf(version, MPI_MAX_LIBRARY_VERSION_STRING, "SMPI Version %d.%d. Copyright The Simgrid Team 2007-201
8
",
SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR);
*len = strlen(version) > MPI_MAX_LIBRARY_VERSION_STRING ? MPI_MAX_LIBRARY_VERSION_STRING : strlen(version);
smpi_bench_begin();
return MPI_SUCCESS;
}
SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR);
*len = strlen(version) > MPI_MAX_LIBRARY_VERSION_STRING ? MPI_MAX_LIBRARY_VERSION_STRING : strlen(version);
smpi_bench_begin();
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;
@@
-107,19
+104,24
@@
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::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;
}
}
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
- simcall_process_kill(SIMIX_process_self());
+ smx_actor_t process = SIMIX_process_self();
+ simgrid::simix::simcall([process] { SIMIX_process_kill(process, process); });
return MPI_SUCCESS;
}
return MPI_SUCCESS;
}
@@
-151,9
+153,9
@@
int PMPI_Get_address(void *location, MPI_Aint * address)
int PMPI_Get_processor_name(char *name, int *resultlen)
{
int PMPI_Get_processor_name(char *name, int *resultlen)
{
- strncpy(name, sg_host_self()->get
Cname(), strlen(sg_host_self()->getCname()) < MPI_MAX_PROCESSOR_NAME - 1
-
? strlen(sg_host_self()->getC
name()) + 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_c
name()) + 1
+
: MPI_MAX_PROCESSOR_NAME - 1);
*resultlen = strlen(name) > MPI_MAX_PROCESSOR_NAME ? MPI_MAX_PROCESSOR_NAME : strlen(name);
return MPI_SUCCESS;
*resultlen = strlen(name) > MPI_MAX_PROCESSOR_NAME ? MPI_MAX_PROCESSOR_NAME : strlen(name);
return MPI_SUCCESS;
@@
-184,7
+186,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;
@@
-214,5
+217,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<simgrid::smpi::Comm>(keyval);
}
int PMPI_Keyval_free(int* keyval) {
return simgrid::smpi::Keyval::keyval_free<simgrid::smpi::Comm>(keyval);
}
-
-} // extern "C"