* under the terms of the license (GNU LGPL) which comes with this package. */
#include "private.hpp"
+#include "simgrid/instr.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "smpi_comm.hpp"
#include "smpi_datatype_derived.hpp"
#include "smpi_status.hpp"
-#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#include "src/smpi/include/smpi_actor.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_pmpi, smpi, "Logging specific to SMPI (pmpi)");
{
//need to end bench otherwise categories for execution tasks are wrong
smpi_bench_end();
- if (category != nullptr)
- TRACE_internal_smpi_set_category(category);
+ if (category != nullptr) {
+ // declare category
+ TRACE_category(category);
+ smpi_process()->set_tracing_category(category);
+ }
//begin bench after changing process's category
smpi_bench_begin();
}
/* PMPI User level calls */
-int PMPI_Init(int *argc, char ***argv)
+int PMPI_Init(int*, char***)
{
xbt_assert(simgrid::s4u::Engine::is_initialized(),
"Your MPI program was not properly initialized. The easiest is to use smpirun to start it.");
{
smpi_bench_end();
// FIXME: should kill all processes in comm instead
- smx_actor_t process = SIMIX_process_self();
- simgrid::simix::simcall([process] { SIMIX_process_kill(process, process); });
+ smx_actor_t actor = SIMIX_process_self();
+ simgrid::simix::simcall([actor] { actor->exit(); });
return MPI_SUCCESS;
}
return sg_maxmin_precision;
}
-int PMPI_Address(void *location, MPI_Aint * address)
+int PMPI_Address(const void* location, MPI_Aint* address)
{
if (address==nullptr) {
return MPI_ERR_ARG;
}
}
-int PMPI_Get_address(void *location, MPI_Aint * address)
+int PMPI_Get_address(const void *location, MPI_Aint * address)
{
return PMPI_Address(location, address);
}
return MPI_SUCCESS;
}
-int PMPI_Get_count(MPI_Status * status, MPI_Datatype datatype, int *count)
+int PMPI_Get_count(const MPI_Status * status, MPI_Datatype datatype, int *count)
{
if (status == nullptr || count == nullptr) {
return MPI_ERR_ARG;
}
int PMPI_Error_string(int errorcode, char* string, int* resultlen){
- if (errorcode<0 || string ==nullptr){
+ if (errorcode<0 || errorcode>= MPI_MAX_ERROR_STRING || string ==nullptr){
return MPI_ERR_ARG;
} else {
static const char *smpi_error_string[] = {
FOREACH_ERROR(GENERATE_STRING)
};
*resultlen = strlen(smpi_error_string[errorcode]);
- strncpy(string, smpi_error_string[errorcode], *resultlen);
+ memcpy(string, smpi_error_string[errorcode], *resultlen*sizeof(char));
return MPI_SUCCESS;
}
}