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
Call smpi_mpi_init before smpi_bench_begin.
[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
6b1c4dc
..
ef203b0
100644
(file)
--- a/
src/smpi/bindings/smpi_pmpi.cpp
+++ b/
src/smpi/bindings/smpi_pmpi.cpp
@@
-1,16
+1,19
@@
-/* Copyright (c) 2007-202
1
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-202
2
. 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"
/* 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/host.h"
#include "simgrid/instr.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/version.h"
#include "simgrid/instr.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/version.h"
+#include "smpi_coll.hpp"
#include "smpi_comm.hpp"
#include "smpi_datatype_derived.hpp"
#include "smpi_status.hpp"
#include "smpi_comm.hpp"
#include "smpi_datatype_derived.hpp"
#include "smpi_status.hpp"
+#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/actor/ActorImpl.hpp"
#include "src/smpi/include/smpi_actor.hpp"
#include "src/kernel/actor/ActorImpl.hpp"
#include "src/smpi/include/smpi_actor.hpp"
@@
-20,14
+23,13
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_pmpi, smpi, "Logging specific to SMPI (pmpi
void TRACE_smpi_set_category(const char *category)
{
//need to end bench otherwise categories for execution tasks are wrong
void TRACE_smpi_set_category(const char *category)
{
//need to end bench otherwise categories for execution tasks are wrong
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
+
if (category != nullptr) {
// declare category
if (category != nullptr) {
// declare category
-
TRACE
_category(category);
+
simgrid::instr::declare_tracing
_category(category);
smpi_process()->set_tracing_category(category);
}
smpi_process()->set_tracing_category(category);
}
- //begin bench after changing process's category
- smpi_bench_begin();
}
/* PMPI User level calls */
}
/* PMPI User level calls */
@@
-51,12
+53,12
@@
int PMPI_Init(int*, char***)
}
simgrid::smpi::ActorExt::init();
}
simgrid::smpi::ActorExt::init();
-
int rank_traced = simgrid::s4u::this_actor::get_pid(
);
-
TRACE_smpi_init(rank_traced, __func__
);
+
TRACE_smpi_init(simgrid::s4u::this_actor::get_pid(), __func__
);
+
smpi_mpi_init(
);
smpi_bench_begin();
smpi_process()->mark_as_initialized();
smpi_bench_begin();
smpi_process()->mark_as_initialized();
- smpi_mpi_init();
+ CHECK_COLLECTIVE(smpi_process()->comm_world(), "MPI_Init")
return MPI_SUCCESS;
}
return MPI_SUCCESS;
}
@@
-64,9
+66,14
@@
int PMPI_Init(int*, char***)
int PMPI_Finalize()
{
smpi_bench_end();
int PMPI_Finalize()
{
smpi_bench_end();
- int rank_traced = simgrid::s4u::this_actor::get_pid();
+ CHECK_COLLECTIVE(smpi_process()->comm_world(), "MPI_Finalize")
+ aid_t rank_traced = simgrid::s4u::this_actor::get_pid();
+ smpi_process()->mark_as_finalizing();
TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::NoOpTIData("finalize"));
TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::NoOpTIData("finalize"));
+ if(simgrid::config::get_value<bool>("smpi/finalization-barrier"))
+ simgrid::smpi::colls::barrier(MPI_COMM_WORLD);
+
smpi_process()->finalize();
TRACE_smpi_comm_out(rank_traced);
smpi_process()->finalize();
TRACE_smpi_comm_out(rank_traced);
@@
-86,9
+93,9
@@
int PMPI_Get_version (int *version,int *subversion){
}
int PMPI_Get_library_version (char *version,int *len){
}
int PMPI_Get_library_version (char *version,int *len){
- snprintf(version, MPI_MAX_LIBRARY_VERSION_STRING, "SMPI Version %d.%d. Copyright The SimGrid Team 2007-202
1
",
+ snprintf(version, MPI_MAX_LIBRARY_VERSION_STRING, "SMPI Version %d.%d. Copyright The SimGrid Team 2007-202
2
",
SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR);
SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR);
- *len = st
rlen(version) > MPI_MAX_LIBRARY_VERSION_STRING ? MPI_MAX_LIBRARY_VERSION_STRING : strlen(version
);
+ *len = st
d::min(static_cast<int>(strlen(version)), MPI_MAX_LIBRARY_VERSION_STRING
);
return MPI_SUCCESS;
}
return MPI_SUCCESS;
}
@@
-129,14
+136,14
@@
int PMPI_Abort(MPI_Comm comm, int /*errorcode*/)
smpi_bench_end();
CHECK_COMM(1)
XBT_WARN("MPI_Abort was called, something went probably wrong in this simulation ! Killing all processes sharing the same MPI_COMM_WORLD");
smpi_bench_end();
CHECK_COMM(1)
XBT_WARN("MPI_Abort was called, something went probably wrong in this simulation ! Killing all processes sharing the same MPI_COMM_WORLD");
+ auto myself = simgrid::kernel::actor::ActorImpl::self();
for (int i = 0; i < comm->size(); i++){
for (int i = 0; i < comm->size(); i++){
-
smx_actor_t actor = comm->group()->actor(i)->get_impl(
);
- if
(actor != SIMIX_process_self()
)
- simgrid::kernel::actor::simcall([actor] { actor->exit(); });
+
auto actor = simgrid::kernel::EngineImpl::get_instance()->get_actor_by_pid(comm->group()->actor(i)
);
+ if
(actor != nullptr && actor != myself
)
+ simgrid::kernel::actor::simcall
_answered
([actor] { actor->exit(); });
}
// now ourself
}
// now ourself
- smx_actor_t actor = SIMIX_process_self();
- simgrid::kernel::actor::simcall([actor] { actor->exit(); });
+ simgrid::kernel::actor::simcall_answered([myself] { myself->exit(); });
return MPI_SUCCESS;
}
return MPI_SUCCESS;
}
@@
-180,7
+187,7
@@
MPI_Aint PMPI_Aint_diff(MPI_Aint address, MPI_Aint disp)
int PMPI_Get_processor_name(char *name, int *resultlen)
{
int PMPI_Get_processor_name(char *name, int *resultlen)
{
- int len = std::min
<int>(sg_host_self()->get_name().size(
), MPI_MAX_PROCESSOR_NAME - 1);
+ int len = std::min
(static_cast<int>(sg_host_self()->get_name().size()
), MPI_MAX_PROCESSOR_NAME - 1);
std::string(sg_host_self()->get_name()).copy(name, len);
name[len] = '\0';
*resultlen = len;
std::string(sg_host_self()->get_name()).copy(name, len);
name[len] = '\0';
*resultlen = len;
@@
-195,10
+202,9
@@
int PMPI_Get_count(const MPI_Status * status, MPI_Datatype datatype, int *count)
} else if (not datatype->is_valid()) {
return MPI_ERR_TYPE;
} else {
} else if (not datatype->is_valid()) {
return MPI_ERR_TYPE;
} else {
- size_t size = datatype->size();
- if (size == 0) {
+ if (datatype->size() == 0) {
*count = 0;
*count = 0;
- } else if (status->count %
size
!= 0) {
+ } else if (status->count %
datatype->size()
!= 0) {
*count = MPI_UNDEFINED;
} else {
*count = simgrid::smpi::Status::get_count(status, datatype);
*count = MPI_UNDEFINED;
} else {
*count = simgrid::smpi::Status::get_count(status, datatype);
@@
-250,7
+256,7
@@
int PMPI_Keyval_create(MPI_Copy_function* copy_fn, MPI_Delete_function* delete_f
int PMPI_Keyval_free(int* keyval) {
CHECK_NULL(1, MPI_ERR_ARG, keyval)
int PMPI_Keyval_free(int* keyval) {
CHECK_NULL(1, MPI_ERR_ARG, keyval)
- CHECK_
MPI_NUL
L(1, MPI_KEYVAL_INVALID, MPI_ERR_KEYVAL, *keyval)
+ CHECK_
VA
L(1, MPI_KEYVAL_INVALID, MPI_ERR_KEYVAL, *keyval)
return simgrid::smpi::Keyval::keyval_free<simgrid::smpi::Comm>(keyval);
}
return simgrid::smpi::Keyval::keyval_free<simgrid::smpi::Comm>(keyval);
}