-/* Copyright (c) 2007-2017. 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 "private.h"
#include "smpi_comm.hpp"
#include "smpi_datatype_derived.hpp"
-#include "smpi_process.hpp"
#include "smpi_status.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();
}
/* 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*, char***)
{
- xbt_assert(simgrid::s4u::Engine::isInitialized(),
+ 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 = smpi_process()->index();
- TRACE_smpi_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__);
+
+ // 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 = 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_traced = simgrid::s4u::this_actor::get_pid();
+ TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::NoOpTIData("finalize"));
smpi_process()->finalize();
- TRACE_smpi_collective_out(rank, __FUNCTION__);
- TRACE_smpi_finalize(smpi_process()->index());
+ 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-2017",
+ 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();
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;
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 {
- *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;
}
}
-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
- simcall_process_kill(SIMIX_process_self());
+ 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);
}
int PMPI_Get_processor_name(char *name, int *resultlen)
{
- strncpy(name, sg_host_self()->getCname(), strlen(sg_host_self()->getCname()) < MPI_MAX_PROCESSOR_NAME - 1
- ? strlen(sg_host_self()->getCname()) + 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_cname()) + 1
+ : MPI_MAX_PROCESSOR_NAME - 1);
*resultlen = strlen(name) > MPI_MAX_PROCESSOR_NAME ? MPI_MAX_PROCESSOR_NAME : strlen(name);
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;
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;
return MPI_SUCCESS;
}
+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)
+ return MPI_ERR_ARG;
+
+ int len = snprintf(string, MPI_MAX_ERROR_STRING, "%s", smpi_error_string[errorcode]);
+ *resultlen = std::min(len, MPI_MAX_ERROR_STRING - 1);
+ 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);
}
int PMPI_Keyval_free(int* keyval) {
return simgrid::smpi::Keyval::keyval_free<simgrid::smpi::Comm>(keyval);
}
-
-} // extern "C"
