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 github.com: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
7b40665
..
090f52a
100644
(file)
--- a/
src/smpi/bindings/smpi_pmpi.cpp
+++ b/
src/smpi/bindings/smpi_pmpi.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-20
20
. 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. */
@@
-7,6
+7,7
@@
#include "simgrid/instr.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/instr.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
+#include "simgrid/version.h"
#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"
@@
-41,11
+42,7
@@
int PMPI_Init(int*, char***)
simgrid::smpi::ActorExt::init();
int rank_traced = simgrid::s4u::this_actor::get_pid();
simgrid::smpi::ActorExt::init();
int rank_traced = simgrid::s4u::this_actor::get_pid();
- TRACE_smpi_init(rank_traced);
- TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::NoOpTIData("init"));
- TRACE_smpi_comm_out(rank_traced);
- TRACE_smpi_computing_init(rank_traced);
- TRACE_smpi_sleeping_init(rank_traced);
+ TRACE_smpi_init(rank_traced, __func__);
smpi_bench_begin();
smpi_process()->mark_as_initialized();
smpi_bench_begin();
smpi_process()->mark_as_initialized();
@@
-79,11
+76,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){
- smpi_bench_end();
- snprintf(version, MPI_MAX_LIBRARY_VERSION_STRING, "SMPI Version %d.%d. Copyright The Simgrid Team 2007-2019",
+ snprintf(version, MPI_MAX_LIBRARY_VERSION_STRING, "SMPI Version %d.%d. Copyright The SimGrid Team 2007-2020",
SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR);
*len = strlen(version) > MPI_MAX_LIBRARY_VERSION_STRING ? MPI_MAX_LIBRARY_VERSION_STRING : strlen(version);
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;
}
return MPI_SUCCESS;
}
@@
-123,6
+118,7
@@
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
+ XBT_WARN("MPI_Abort was called, something went probably wrong in this simulation ! Killing this process");
smx_actor_t actor = SIMIX_process_self();
simgrid::kernel::actor::simcall([actor] { actor->exit(); });
return MPI_SUCCESS;
smx_actor_t actor = SIMIX_process_self();
simgrid::kernel::actor::simcall([actor] { actor->exit(); });
return MPI_SUCCESS;
@@
-156,10
+152,10
@@
int PMPI_Get_address(const 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()->get_cname()) < MPI_MAX_PROCESSOR_NAME - 1 ? strlen(sg_host_self()->get_cname()) + 1
-
: MPI_MAX_PROCESSOR_NAME - 1)
;
- *resultlen =
strlen(name) > MPI_MAX_PROCESSOR_NAME ? MPI_MAX_PROCESSOR_NAME : strlen(name)
;
+ int len = std::min<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
;
return MPI_SUCCESS;
}
return MPI_SUCCESS;
}
@@
-213,9
+209,8
@@
int PMPI_Error_class(int errorcode, int* errorclass) {
int PMPI_Error_string(int errorcode, char* string, int* resultlen)
{
int PMPI_Error_string(int errorcode, char* string, int* resultlen)
{
- static const char* smpi_error_string[] = {FOREACH_ERROR(GENERATE_STRING)};
- constexpr int nerrors = (sizeof smpi_error_string) / (sizeof smpi_error_string[0]);
- if (errorcode < 0 || errorcode >= nerrors || string == nullptr)
+ static const std::vector<const char*> smpi_error_string = {FOREACH_ERROR(GENERATE_STRING)};
+ if (errorcode < 0 || static_cast<size_t>(errorcode) >= smpi_error_string.size() || string == nullptr)
return MPI_ERR_ARG;
int len = snprintf(string, MPI_MAX_ERROR_STRING, "%s", smpi_error_string[errorcode]);
return MPI_ERR_ARG;
int len = snprintf(string, MPI_MAX_ERROR_STRING, "%s", smpi_error_string[errorcode]);
@@
-236,7
+231,7
@@
int PMPI_Keyval_free(int* keyval) {
MPI_Errhandler PMPI_Errhandler_f2c(MPI_Fint errhan){
if(errhan==-1)
return MPI_ERRHANDLER_NULL;
MPI_Errhandler PMPI_Errhandler_f2c(MPI_Fint errhan){
if(errhan==-1)
return MPI_ERRHANDLER_NULL;
- return s
tatic_cast<MPI_Errhandler>(simgrid::smpi::Errhandler::f2c(errhan)
);
+ return s
imgrid::smpi::Errhandler::f2c(errhan
);
}
MPI_Fint PMPI_Errhandler_c2f(MPI_Errhandler errhan){
}
MPI_Fint PMPI_Errhandler_c2f(MPI_Errhandler errhan){