/* 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 "smpi_host.hpp"
#include "mc/mc.h"
#include "simgrid/s4u/Engine.hpp"
#include "smpi_coll.hpp"
-#include "smpi_process.hpp"
-#include "src/msg/msg_private.hpp"
+#include "smpi_f2c.hpp"
+#include "smpi_host.hpp"
+#include "src/kernel/activity/CommImpl.hpp"
#include "src/simix/smx_private.hpp"
+#include "src/smpi/include/smpi_actor.hpp"
#include "xbt/config.hpp"
+#include <algorithm>
#include <cfloat> /* DBL_MAX */
+#include <cinttypes>
+#include <cstdint> /* intmax_t */
#include <dlfcn.h>
#include <fcntl.h>
+#include <fstream>
+
#if not defined(__APPLE__)
#include <link.h>
#endif
-#include <fstream>
+
+#if defined(__APPLE__)
+# include <AvailabilityMacros.h>
+# ifndef MAC_OS_X_VERSION_10_12
+# define MAC_OS_X_VERSION_10_12 101200
+# endif
+# define HAVE_WORKING_MMAP (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+# define HAVE_WORKING_MMAP 0
+#else
+# define HAVE_WORKING_MMAP 1
+#endif
#if HAVE_SENDFILE
#include <sys/sendfile.h>
#include <boost/tokenizer.hpp>
#include <boost/algorithm/string.hpp> /* trim_right / trim_left */
-#ifndef RTLD_DEEPBIND
+#if SMPI_IFORT
+ extern "C" void for_rtl_init_ (int *, char **);
+ extern "C" void for_rtl_finish_ ();
+#elif SMPI_FLANG
+ extern "C" void __io_set_argc(int);
+ extern "C" void __io_set_argv(char **);
+#elif SMPI_GFORTRAN
+ extern "C" void _gfortran_set_args(int, char **);
+#endif
+
/* RTLD_DEEPBIND is a bad idea of GNU ld that obviously does not exist on other platforms
* See https://www.akkadia.org/drepper/dsohowto.pdf
* and https://lists.freebsd.org/pipermail/freebsd-current/2016-March/060284.html
*/
-#define RTLD_DEEPBIND 0
+#if !defined(RTLD_DEEPBIND) || HAVE_SANITIZER_ADDRESS || HAVE_SANITIZER_THREAD
+#define WANT_RTLD_DEEPBIND 0
+#else
+#define WANT_RTLD_DEEPBIND RTLD_DEEPBIND
#endif
#if HAVE_PAPI
#include "papi.h"
-const char* papi_default_config_name = "default";
-
-struct papi_process_data {
- papi_counter_t counter_data;
- int event_set;
-};
+std::string papi_default_config_name = "default";
+std::map</* computation unit name */ std::string, papi_process_data> units2papi_setup;
#endif
using simgrid::s4u::Actor;
using simgrid::s4u::ActorPtr;
std::unordered_map<std::string, double> location2speedup;
-static std::map</*process_id*/ ActorPtr, simgrid::smpi::Process*> process_data;
+static std::map</*process_id*/ ActorPtr, simgrid::smpi::ActorExt*> process_data;
int process_count = 0;
static int smpi_exit_status = 0;
int smpi_universe_size = 0;
// No instance gets manually created; check also the smpirun.in script as
// this default name is used there as well (when the <actor> tag is generated).
static const std::string smpi_default_instance_name("smpirun");
-static simgrid::config::Flag<double> smpi_wtime_sleep(
- "smpi/wtime", "Minimum time to inject inside a call to MPI_Wtime", 0.0);
static simgrid::config::Flag<double> smpi_init_sleep(
"smpi/init", "Time to inject inside a call to MPI_Init", 0.0);
return process_count;
}
-simgrid::smpi::Process* smpi_process()
+simgrid::smpi::ActorExt* smpi_process()
{
ActorPtr me = Actor::self();
+
if (me == nullptr) // This happens sometimes (eg, when linking against NS3 because it pulls openMPI...)
return nullptr;
- simgrid::msg::ActorExt* msgExt = static_cast<simgrid::msg::ActorExt*>(me->get_impl()->getUserData());
- return static_cast<simgrid::smpi::Process*>(msgExt->data);
+
+ return process_data.at(me);
}
-simgrid::smpi::Process* smpi_process_remote(ActorPtr actor)
+simgrid::smpi::ActorExt* smpi_process_remote(ActorPtr actor)
{
return process_data.at(actor);
}
}
void smpi_process_init(int *argc, char ***argv){
- simgrid::smpi::Process::init(argc, argv);
-}
-
-int smpi_process_index(){
- return simgrid::s4u::this_actor::get_pid();
+ simgrid::smpi::ActorExt::init();
}
void * smpi_process_get_user_data(){
- return smpi_process()->get_user_data();
+ return Actor::self()->get_impl()->get_user_data();
}
void smpi_process_set_user_data(void *data){
- return smpi_process()->set_user_data(data);
+ Actor::self()->get_impl()->set_user_data(data);
}
smpi_comm_copy_data_callback = callback;
}
-static void print(std::vector<std::pair<size_t, size_t>> vec) {
- std::fprintf(stderr, "{");
- for (auto const& elt : vec) {
- std::fprintf(stderr, "(0x%zx, 0x%zx),", elt.first, elt.second);
- }
- std::fprintf(stderr, "}\n");
-}
static void memcpy_private(void* dest, const void* src, std::vector<std::pair<size_t, size_t>>& private_blocks)
{
for (auto const& block : private_blocks)
// This map holds for each computation unit (such as "default" or "process1" etc.)
// the configuration as given by the user (counter data as a pair of (counter_name, counter_counter))
// and the (computed) event_set.
- std::map</* computation unit name */ std::string, papi_process_data> units2papi_setup;
if (not simgrid::config::get_value<std::string>("smpi/papi-events").empty()) {
if (PAPI_library_init(PAPI_VER_CURRENT) != PAPI_VER_CURRENT)
XBT_ERROR("Could not initialize PAPI library; is it correctly installed and linked?"
- " Expected version is %i",
- PAPI_VER_CURRENT);
+ " Expected version is %u", PAPI_VER_CURRENT);
typedef boost::tokenizer<boost::char_separator<char>> Tokenizer;
boost::char_separator<char> separator_units(";");
if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP)
smpi_destroy_global_memory_segments();
smpi_free_static();
+ if(simgrid::smpi::F2C::lookup() != nullptr)
+ simgrid::smpi::F2C::delete_lookup();
}
static void smpi_init_options(){
simgrid::smpi::Colls::smpi_coll_cleanup_callback = nullptr;
smpi_cpu_threshold = simgrid::config::get_value<double>("smpi/cpu-threshold");
smpi_host_speed = simgrid::config::get_value<double>("smpi/host-speed");
- xbt_assert(smpi_host_speed >= 0, "You're trying to set the host_speed to a negative value (%f)", smpi_host_speed);
+ xbt_assert(smpi_host_speed > 0.0, "You're trying to set the host_speed to a non-positive value (given: %f)", smpi_host_speed);
std::string smpi_privatize_option = simgrid::config::get_value<std::string>("smpi/privatization");
if (smpi_privatize_option == "no" || smpi_privatize_option == "0")
smpi_privatize_global_variables = SmpiPrivStrategies::NONE;
XBT_DEBUG("Running without smpi_main(); disable smpi/privatization.");
smpi_privatize_global_variables = SmpiPrivStrategies::NONE;
}
-#if defined(__FreeBSD__)
+#if !HAVE_WORKING_MMAP
if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) {
- XBT_INFO("mmap privatization is broken on FreeBSD, switching to dlopen privatization instead.");
+ XBT_INFO("mmap privatization is broken on this platform, switching to dlopen privatization instead.");
smpi_privatize_global_variables = SmpiPrivStrategies::DLOPEN;
}
#endif
typedef int (* smpi_c_entry_point_type)(int argc, char **argv);
typedef void (*smpi_fortran_entry_point_type)();
-static int smpi_run_entry_point(smpi_entry_point_type entry_point, std::vector<std::string> args)
+static int smpi_run_entry_point(smpi_entry_point_type entry_point, const std::string& executable_path,
+ std::vector<std::string> args)
{
- char noarg[] = {'\0'};
- const int argc = args.size();
- std::unique_ptr<char*[]> argv(new char*[argc + 1]);
- for (int i = 0; i != argc; ++i)
- argv[i] = args[i].empty() ? noarg : &args[i].front();
- argv[argc] = nullptr;
-
- int res = entry_point(argc, argv.get());
+ // copy C strings, we need them writable
+ std::vector<char*>* args4argv = new std::vector<char*>(args.size());
+ std::transform(begin(args), end(args), begin(*args4argv), [](const std::string& s) { return xbt_strdup(s.c_str()); });
+
+ // set argv[0] to executable_path
+ xbt_free((*args4argv)[0]);
+ (*args4argv)[0] = xbt_strdup(executable_path.c_str());
+
+#if !SMPI_IFORT
+ // take a copy of args4argv to keep reference of the allocated strings
+ const std::vector<char*> args2str(*args4argv);
+#endif
+ int argc = args4argv->size();
+ args4argv->push_back(nullptr);
+ char** argv = args4argv->data();
+
+ simgrid::smpi::ActorExt::init();
+#if SMPI_IFORT
+ for_rtl_init_ (&argc, argv);
+#elif SMPI_FLANG
+ __io_set_argc(argc);
+ __io_set_argv(argv);
+#elif SMPI_GFORTRAN
+ _gfortran_set_args(argc, argv);
+#endif
+ int res = entry_point(argc, argv);
+
+#if SMPI_IFORT
+ for_rtl_finish_ ();
+#else
+ for (char* s : args2str)
+ xbt_free(s);
+ delete args4argv;
+#endif
+
if (res != 0){
XBT_WARN("SMPI process did not return 0. Return value : %d", res);
if (smpi_exit_status == 0)
smpi_fortran_entry_point_type entry_point_fortran = (smpi_fortran_entry_point_type)dlsym(handle, "user_main_");
if (entry_point_fortran != nullptr) {
return [entry_point_fortran](int argc, char** argv) {
- smpi_process_init(&argc, &argv);
entry_point_fortran();
return 0;
};
return smpi_entry_point_type();
}
-static void smpi_copy_file(std::string src,std::string target, off_t fdin_size, int rank){
-
- int fdin = open(src.c_str(), O_RDONLY);
- xbt_assert(fdin >= 0, "Cannot read from %s. Please make sure that the file exists and is executable.",
- src.c_str());
- int fdout = open(target.c_str(), O_CREAT | O_RDWR, S_IRWXU);
- xbt_assert(fdout >= 0, "Cannot write into %s", target.c_str());
+static void smpi_copy_file(std::string src, std::string target, off_t fdin_size)
+{
+ int fdin = open(src.c_str(), O_RDONLY);
+ xbt_assert(fdin >= 0, "Cannot read from %s. Please make sure that the file exists and is executable.", src.c_str());
+ int fdout = open(target.c_str(), O_CREAT | O_RDWR, S_IRWXU);
+ xbt_assert(fdout >= 0, "Cannot write into %s", target.c_str());
- XBT_DEBUG("Copy %ld bytes into %s", static_cast<long>(fdin_size), target.c_str());
+ XBT_DEBUG("Copy %" PRIdMAX " bytes into %s", static_cast<intmax_t>(fdin_size), target.c_str());
+ bool slow_copy = true;
#if HAVE_SENDFILE
- ssize_t sent_size = sendfile(fdout, fdin, NULL, fdin_size);
- xbt_assert(sent_size == fdin_size,
- "Error while copying %s: only %zd bytes copied instead of %ld (errno: %d -- %s)",
- target.c_str(), sent_size, fdin_size, errno, strerror(errno));
-#else
+ ssize_t sent_size = sendfile(fdout, fdin, NULL, fdin_size);
+ if (sent_size == fdin_size)
+ slow_copy = false;
+ else if (sent_size != -1 || errno != ENOSYS)
+ xbt_die("Error while copying %s: only %zd bytes copied instead of %" PRIdMAX " (errno: %d -- %s)", target.c_str(),
+ sent_size, static_cast<intmax_t>(fdin_size), errno, strerror(errno));
+#endif
+ if (slow_copy) {
const int bufsize = 1024 * 1024 * 4;
char buf[bufsize];
while (int got = read(fdin, buf, bufsize)) {
}
}
}
-#endif
- close(fdin);
- close(fdout);
+ }
+ close(fdin);
+ close(fdout);
}
#if not defined(__APPLE__)
-static int visit_libs (struct dl_phdr_info *info,
- size_t size, void *data){
+static int visit_libs(struct dl_phdr_info* info, size_t, void* data)
+{
char* libname = (char*)(data);
const char *path = info->dlpi_name;
if(strstr(path, libname)){
}
#endif
-int smpi_main(const char* executable, int argc, char *argv[])
+static void smpi_init_privatization_dlopen(const std::string& executable)
+{
+ // Prepare the copy of the binary (get its size)
+ struct stat fdin_stat;
+ stat(executable.c_str(), &fdin_stat);
+ off_t fdin_size = fdin_stat.st_size;
+ static std::size_t rank = 0;
+
+ std::string libnames = simgrid::config::get_value<std::string>("smpi/privatize-libs");
+ if (not libnames.empty()) {
+ // split option
+ std::vector<std::string> privatize_libs;
+ boost::split(privatize_libs, libnames, boost::is_any_of(";"));
+
+ for (auto const& libname : privatize_libs) {
+ // load the library once to add it to the local libs, to get the absolute path
+ void* libhandle = dlopen(libname.c_str(), RTLD_LAZY);
+ // get library name from path
+ char fullpath[512] = {'\0'};
+ strcpy(fullpath, libname.c_str());
+#if not defined(__APPLE__)
+ int ret = dl_iterate_phdr(visit_libs, fullpath);
+ if (ret == 0)
+ xbt_die("Can't find a linked %s - check the setting you gave to smpi/privatize-libs", fullpath);
+ else
+ XBT_DEBUG("Extra lib to privatize found : %s", fullpath);
+#else
+ xbt_die("smpi/privatize-libs is not (yet) compatible with OSX");
+#endif
+ privatize_libs_paths.push_back(fullpath);
+ dlclose(libhandle);
+ }
+ }
+
+ simix_global->default_function = [executable, fdin_size](std::vector<std::string> args) {
+ return std::function<void()>([executable, fdin_size, args] {
+ // Copy the dynamic library:
+ std::string target_executable =
+ executable + "_" + std::to_string(getpid()) + "_" + std::to_string(rank) + ".so";
+
+ smpi_copy_file(executable, target_executable, fdin_size);
+ // if smpi/privatize-libs is set, duplicate pointed lib and link each executable copy to a different one.
+ std::vector<std::string> target_libs;
+ for (auto const& libpath : privatize_libs_paths) {
+ // if we were given a full path, strip it
+ size_t index = libpath.find_last_of("/\\");
+ std::string libname;
+ if (index != std::string::npos)
+ libname = libpath.substr(index + 1);
+
+ if (not libname.empty()) {
+ // load the library to add it to the local libs, to get the absolute path
+ struct stat fdin_stat2;
+ stat(libpath.c_str(), &fdin_stat2);
+ off_t fdin_size2 = fdin_stat2.st_size;
+
+ // Copy the dynamic library, the new name must be the same length as the old one
+ // just replace the name with 7 digits for the rank and the rest of the name.
+ unsigned int pad = 7;
+ if (libname.length() < pad)
+ pad = libname.length();
+ std::string target_lib =
+ std::string(pad - std::to_string(rank).length(), '0') + std::to_string(rank) + libname.substr(pad);
+ target_libs.push_back(target_lib);
+ XBT_DEBUG("copy lib %s to %s, with size %lld", libpath.c_str(), target_lib.c_str(), (long long)fdin_size2);
+ smpi_copy_file(libpath, target_lib, fdin_size2);
+
+ std::string sedcommand = "sed -i -e 's/" + libname + "/" + target_lib + "/g' " + target_executable;
+ int ret = system(sedcommand.c_str());
+ if (ret != 0)
+ xbt_die("error while applying sed command %s \n", sedcommand.c_str());
+ }
+ }
+
+ rank++;
+ // Load the copy and resolve the entry point:
+ void* handle = dlopen(target_executable.c_str(), RTLD_LAZY | RTLD_LOCAL | WANT_RTLD_DEEPBIND);
+ int saved_errno = errno;
+ if (simgrid::config::get_value<bool>("smpi/keep-temps") == false) {
+ unlink(target_executable.c_str());
+ for (const std::string& target_lib : target_libs)
+ unlink(target_lib.c_str());
+ }
+ if (handle == nullptr)
+ xbt_die("dlopen failed: %s (errno: %d -- %s)", dlerror(), saved_errno, strerror(saved_errno));
+ smpi_entry_point_type entry_point = smpi_resolve_function(handle);
+ if (not entry_point)
+ xbt_die("Could not resolve entry point");
+ smpi_run_entry_point(entry_point, executable, args);
+ });
+ };
+}
+
+static void smpi_init_privatization_no_dlopen(const std::string& executable)
+{
+ if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP)
+ smpi_prepare_global_memory_segment();
+ // Load the dynamic library and resolve the entry point:
+ void* handle = dlopen(executable.c_str(), RTLD_LAZY | RTLD_LOCAL);
+ if (handle == nullptr)
+ xbt_die("dlopen failed for %s: %s (errno: %d -- %s)", executable.c_str(), dlerror(), errno, strerror(errno));
+ smpi_entry_point_type entry_point = smpi_resolve_function(handle);
+ if (not entry_point)
+ xbt_die("main not found in %s", executable.c_str());
+ if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP)
+ smpi_backup_global_memory_segment();
+
+ // Execute the same entry point for each simulated process:
+ simix_global->default_function = [entry_point, executable](std::vector<std::string> args) {
+ return std::function<void()>(
+ [entry_point, executable, args] { smpi_run_entry_point(entry_point, executable, args); });
+ };
+}
+
+int smpi_main(const char* executable, int argc, char* argv[])
{
srand(SMPI_RAND_SEED);
}
TRACE_global_init();
-
SIMIX_global_init(&argc, argv);
- MSG_init(&argc,argv);
SMPI_switch_data_segment = &smpi_switch_data_segment;
// TODO This will not be executed in the case where smpi_main is not called,
// e.g., not for smpi_msg_masterslave. This should be moved to another location
- // that is always called -- maybe close to Actor::onCreation?
+ // that is always called -- maybe close to Actor::on_creation?
simgrid::s4u::Host::on_creation.connect(
[](simgrid::s4u::Host& host) { host.extension_set(new simgrid::smpi::Host(&host)); });
// parse the platform file: get the host list
- SIMIX_create_environment(argv[1]);
+ simgrid::s4u::Engine::get_instance()->load_platform(argv[1]);
SIMIX_comm_set_copy_data_callback(smpi_comm_copy_buffer_callback);
smpi_init_options();
- if (smpi_privatize_global_variables == SmpiPrivStrategies::DLOPEN) {
-
- std::string executable_copy = executable;
-
- // Prepare the copy of the binary (get its size)
- struct stat fdin_stat;
- stat(executable_copy.c_str(), &fdin_stat);
- off_t fdin_size = fdin_stat.st_size;
- static std::size_t rank = 0;
-
-
- std::string libnames = simgrid::config::get_value<std::string>("smpi/privatize-libs");
- if(not libnames.empty()){
- //split option
- std::vector<std::string> privatize_libs;
- boost::split(privatize_libs,libnames, boost::is_any_of(";"));
-
- for (auto const& libname : privatize_libs) {
- //load the library once to add it to the local libs, to get the absolute path
- void* libhandle = dlopen(libname.c_str(), RTLD_LAZY);
- //get library name from path
- char fullpath[512]={'\0'};
- strcpy(fullpath, libname.c_str());
-#if not defined(__APPLE__)
- int ret = dl_iterate_phdr(visit_libs, fullpath);
- if(ret==0)
- xbt_die("Can't find a linked %s - check the setting you gave to smpi/privatize-libs", fullpath);
- else
- XBT_DEBUG("Extra lib to privatize found : %s", fullpath);
-#else
- xbt_die("smpi/privatize-libs is not (yet) compatible with OSX");
-#endif
- privatize_libs_paths.push_back(fullpath);
- dlclose(libhandle);
- }
- }
-
- simix_global->default_function = [executable_copy, fdin_size](std::vector<std::string> args) {
- return std::function<void()>([executable_copy, fdin_size, args] {
-
- // Copy the dynamic library:
- std::string target_executable = executable_copy
- + "_" + std::to_string(getpid())
- + "_" + std::to_string(rank) + ".so";
-
- smpi_copy_file(executable_copy, target_executable, fdin_size, rank);
- //if smpi/privatize-libs is set, duplicate pointed lib and link each executable copy to a different one.
- std::string target_lib;
- for (auto const& libpath : privatize_libs_paths){
- //if we were given a full path, strip it
- size_t index = libpath.find_last_of("/\\");
- std::string libname;
- if(index!=std::string::npos)
- libname=libpath.substr(index+1);
-
- if(not libname.empty()){
- //load the library to add it to the local libs, to get the absolute path
- struct stat fdin_stat2;
- stat(libpath.c_str(), &fdin_stat2);
- off_t fdin_size2 = fdin_stat2.st_size;
-
- // Copy the dynamic library, the new name must be the same length as the old one
- // just replace the name with 7 digits for the rank and the rest of the name.
- unsigned int pad=7;
- if(libname.length()<pad)
- pad=libname.length();
- target_lib = std::string(pad - std::to_string(rank).length(), '0')
- +std::to_string(rank)+libname.substr(pad);
- XBT_DEBUG("copy lib %s to %s, with size %ld", libpath.c_str(), target_lib.c_str(), fdin_size2);
- smpi_copy_file(libpath, target_lib, fdin_size2, rank);
-
- std::string sedcommand = "sed -i -e 's/"+libname+"/"+target_lib+"/g' "+target_executable;
- int ret = system(sedcommand.c_str());
- if(ret!=0) xbt_die ("error while applying sed command %s \n", sedcommand.c_str());
- }
- }
-
- rank++;
- // Load the copy and resolve the entry point:
- void* handle = dlopen(target_executable.c_str(), RTLD_LAZY | RTLD_LOCAL | RTLD_DEEPBIND);
- int saved_errno = errno;
- if (simgrid::config::get_value<bool>("smpi/keep-temps") == false){
- unlink(target_executable.c_str());
- if(not target_lib.empty())
- unlink(target_lib.c_str());
- }
- if (handle == nullptr)
- xbt_die("dlopen failed: %s (errno: %d -- %s)", dlerror(), saved_errno, strerror(saved_errno));
- smpi_entry_point_type entry_point = smpi_resolve_function(handle);
- if (not entry_point)
- xbt_die("Could not resolve entry point");
- smpi_run_entry_point(entry_point, args);
- });
- };
- }
- else {
- if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP)
- smpi_prepare_global_memory_segment();
- // Load the dynamic library and resolve the entry point:
- void* handle = dlopen(executable, RTLD_LAZY | RTLD_LOCAL);
- if (handle == nullptr)
- xbt_die("dlopen failed for %s: %s (errno: %d -- %s)", executable, dlerror(), errno, strerror(errno));
- smpi_entry_point_type entry_point = smpi_resolve_function(handle);
- if (not entry_point)
- xbt_die("main not found in %s", executable);
- if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP)
- smpi_backup_global_memory_segment();
-
- // Execute the same entry point for each simulated process:
- simix_global->default_function = [entry_point](std::vector<std::string> args) {
- return std::function<void()>([entry_point, args] {
- smpi_run_entry_point(entry_point, args);
- });
- };
- }
+ if (smpi_privatize_global_variables == SmpiPrivStrategies::DLOPEN)
+ smpi_init_privatization_dlopen(executable);
+ else
+ smpi_init_privatization_no_dlopen(executable);
SMPI_init();
- SIMIX_launch_application(argv[2]);
+ simgrid::s4u::Engine::get_instance()->load_deployment(argv[2]);
SMPI_app_instance_register(smpi_default_instance_name.c_str(), nullptr,
process_data.size()); // This call has a side effect on process_count...
MPI_COMM_WORLD = *smpi_deployment_comm_world(smpi_default_instance_name);
void SMPI_init(){
simgrid::s4u::Actor::on_creation.connect([](simgrid::s4u::ActorPtr actor) {
if (not actor->is_daemon()) {
- process_data.insert({actor, new simgrid::smpi::Process(actor, nullptr)});
+ process_data.insert({actor, new simgrid::smpi::ActorExt(actor, nullptr)});
}
});
simgrid::s4u::Actor::on_destruction.connect([](simgrid::s4u::ActorPtr actor) {
smpi_init_options();
smpi_global_init();
smpi_check_options();
- simgrid::s4u::on_simulation_end.connect(TRACE_smpi_release);
}
void SMPI_finalize(){
}
void smpi_mpi_init() {
+ smpi_init_fortran_types();
if(smpi_init_sleep > 0)
simcall_process_sleep(smpi_init_sleep);
}
-
-double smpi_mpi_wtime(){
- double time;
- if (smpi_process()->initialized() != 0 && smpi_process()->finalized() == 0 && smpi_process()->sampling() == 0) {
- smpi_bench_end();
- time = SIMIX_get_clock();
- // to avoid deadlocks if used as a break condition, such as
- // while (MPI_Wtime(...) < time_limit) {
- // ....
- // }
- // because the time will not normally advance when only calls to MPI_Wtime
- // are made -> deadlock (MPI_Wtime never reaches the time limit)
- if(smpi_wtime_sleep > 0)
- simcall_process_sleep(smpi_wtime_sleep);
- smpi_bench_begin();
- } else {
- time = SIMIX_get_clock();
- }
- return time;
-}
-
