-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2019. 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"
+#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_process.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();
- 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();
}
{
xbt_assert(simgrid::s4u::Engine::is_initialized(),
"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;
- MPI_Initialized(&already_init);
- if(already_init == 0){
- simgrid::smpi::Process::init(argc, argv);
- smpi_process()->mark_as_initialized();
- int rank = simgrid::s4u::this_actor::get_pid();
- 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_sleeping_init(rank);
+
+ // Init is called only once per SMPI process
+ if (not smpi_process()->initializing()){
+ simgrid::smpi::ActorExt::init();
+ }
+ if (not smpi_process()->initialized()){
+ 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);
smpi_bench_begin();
+ smpi_process()->mark_as_initialized();
}
smpi_mpi_init();
int PMPI_Finalize()
{
smpi_bench_end();
- int rank = simgrid::s4u::this_actor::get_pid();
- TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::NoOpTIData("finalize"));
+ int rank_traced = simgrid::s4u::this_actor::get_pid();
+ TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::NoOpTIData("finalize"));
smpi_process()->finalize();
- TRACE_smpi_comm_out(rank);
- TRACE_smpi_finalize(rank);
+ TRACE_smpi_comm_out(rank_traced);
+ TRACE_smpi_finalize(rank_traced);
return MPI_SUCCESS;
}
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-2018",
+ snprintf(version, MPI_MAX_LIBRARY_VERSION_STRING, "SMPI Version %d.%d. Copyright The Simgrid Team 2007-2019",
SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR);
*len = strlen(version) > MPI_MAX_LIBRARY_VERSION_STRING ? MPI_MAX_LIBRARY_VERSION_STRING : strlen(version);
smpi_bench_begin();
{
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 MPI_SUCCESS;
}
+int PMPI_Error_string(int errorcode, char* string, int* resultlen){
+ 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);
+ return MPI_SUCCESS;
+ }
+}
+
int PMPI_Keyval_create(MPI_Copy_function* copy_fn, MPI_Delete_function* delete_fn, int* keyval, void* extra_state) {
- smpi_copy_fn _copy_fn={copy_fn,nullptr,nullptr};
- smpi_delete_fn _delete_fn={delete_fn,nullptr,nullptr};
+ smpi_copy_fn _copy_fn={copy_fn,nullptr,nullptr,nullptr,nullptr,nullptr};
+ smpi_delete_fn _delete_fn={delete_fn,nullptr,nullptr,nullptr,nullptr,nullptr};
return simgrid::smpi::Keyval::keyval_create<simgrid::smpi::Comm>(_copy_fn, _delete_fn, keyval, extra_state);
}