X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/68655c26de20336ad3401d9250de95c2057ea278..819942b4ca0be7a019133420d20004abf80de221:/src/smpi/internals/smpi_global.cpp diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 0fa426029b..f63b4d9095 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -15,6 +15,8 @@ #include #include /* DBL_MAX */ +#include +#include /* intmax_t */ #include #include #include @@ -53,12 +55,14 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi, "Logging specific to SMPI (ke extern "C" void _gfortran_set_args(int, char **); #endif -#ifndef RTLD_DEEPBIND /* 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 @@ -95,8 +99,6 @@ MPI_Errhandler *MPI_ERRHANDLER_NULL = nullptr; // No instance gets manually created; check also the smpirun.in script as // this default name is used there as well (when the tag is generated). static const std::string smpi_default_instance_name("smpirun"); -static simgrid::config::Flag smpi_wtime_sleep( - "smpi/wtime", "Minimum time to inject inside a call to MPI_Wtime", 0.0); static simgrid::config::Flag smpi_init_sleep( "smpi/init", "Time to inject inside a call to MPI_Init", 0.0); @@ -130,10 +132,6 @@ void smpi_process_init(int *argc, char ***argv){ simgrid::smpi::ActorExt::init(argc, argv); } -int smpi_process_index(){ - return simgrid::s4u::this_actor::get_pid(); -} - void * smpi_process_get_user_data(){ return Actor::self()->get_impl()->get_user_data(); } @@ -428,14 +426,16 @@ typedef void (*smpi_fortran_entry_point_type)(); static int smpi_run_entry_point(smpi_entry_point_type entry_point, std::vector args) { // copy C strings, we need them writable - std::vector args4argv(args.size()); - std::transform(begin(args), end(args), begin(args4argv), [](const std::string& s) { return xbt_strdup(s.c_str()); }); + std::vector* args4argv = new std::vector(args.size()); + std::transform(begin(args), end(args), begin(*args4argv), [](const std::string& s) { return xbt_strdup(s.c_str()); }); +#if !SMPI_IFORT // take a copy of args4argv to keep reference of the allocated strings - const std::vector args2str(args4argv); - int argc = args4argv.size(); - args4argv.push_back(nullptr); - char** argv = args4argv.data(); + const std::vector args2str(*args4argv); +#endif + int argc = args4argv->size(); + args4argv->push_back(nullptr); + char** argv = args4argv->data(); simgrid::smpi::ActorExt::init(&argc, &argv); #if SMPI_IFORT @@ -450,9 +450,11 @@ static int smpi_run_entry_point(smpi_entry_point_type entry_point, std::vector= 0, "Cannot write into %s", target.c_str()); - XBT_DEBUG("Copy %ld bytes into %s", static_cast(fdin_size), target.c_str()); + XBT_DEBUG("Copy %" PRIdMAX " bytes into %s", static_cast(fdin_size), target.c_str()); #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)); + xbt_assert(sent_size == fdin_size, + "Error while copying %s: only %zd bytes copied instead of %" PRIdMAX " (errno: %d -- %s)", target.c_str(), + sent_size, static_cast(fdin_size), errno, strerror(errno)); #else const int bufsize = 1024 * 1024 * 4; char buf[bufsize]; @@ -575,7 +578,7 @@ static void smpi_init_privatization_dlopen(std::string executable) 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::string target_lib; + std::vector 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("/\\"); @@ -594,8 +597,9 @@ static void smpi_init_privatization_dlopen(std::string executable) unsigned int pad = 7; if (libname.length() < pad) pad = libname.length(); - target_lib = + 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); @@ -608,11 +612,11 @@ static void smpi_init_privatization_dlopen(std::string executable) rank++; // Load the copy and resolve the entry point: - void* handle = dlopen(target_executable.c_str(), RTLD_LAZY | RTLD_LOCAL | RTLD_DEEPBIND); + void* handle = dlopen(target_executable.c_str(), RTLD_LAZY | RTLD_LOCAL | WANT_RTLD_DEEPBIND); int saved_errno = errno; if (simgrid::config::get_value("smpi/keep-temps") == false) { unlink(target_executable.c_str()); - if (not target_lib.empty()) + for (const std::string& target_lib : target_libs) unlink(target_lib.c_str()); } if (handle == nullptr) @@ -741,24 +745,3 @@ void smpi_mpi_init() { 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; -} -