X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f8856118321c58129177e1392dbd03be2db142af..7ca53b5ebe9b96f24832b6890a34e13599b254c2:/src/smpi/internals/smpi_global.cpp diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 4528d48f88..2e96efe233 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2021. 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. */ @@ -17,10 +17,13 @@ #include "xbt/file.hpp" #include +#include #include /* split */ #include +#include #include #include /* intmax_t */ +#include /* strerror */ #include #include #include @@ -62,7 +65,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi, "Logging specific to SMPI (ke #if HAVE_PAPI std::string papi_default_config_name = "default"; -std::map units2papi_setup; +std::map> units2papi_setup; #endif std::unordered_map location2speedup; @@ -236,7 +239,7 @@ static void smpi_init_papi() XBT_ERROR("Could not initialize PAPI library; is it correctly installed and linked?" " Expected version is %u", PAPI_VER_CURRENT); - typedef boost::tokenizer> Tokenizer; + using Tokenizer = boost::tokenizer>; boost::char_separator separator_units(";"); std::string str = smpi_cfg_papi_events_file(); Tokenizer tokens(str, separator_units); @@ -274,9 +277,7 @@ static void smpi_init_papi() } XBT_DEBUG("Successfully added PAPI event '%s' to the event set.", event_name); - counters2values.push_back( - // We cannot just pass *events_it, as this is of type const basic_string - std::make_pair(std::string(*events_it), 0LL)); + counters2values.emplace_back(*events_it, 0LL); } std::string unit_name = *(event_tokens.begin()); @@ -288,11 +289,9 @@ static void smpi_init_papi() #endif } - - -typedef std::function smpi_entry_point_type; -typedef int (* smpi_c_entry_point_type)(int argc, char **argv); -typedef void (*smpi_fortran_entry_point_type)(); +using smpi_entry_point_type = std::function; +using smpi_c_entry_point_type = int (*)(int argc, char** argv); +using smpi_fortran_entry_point_type = void (*)(); template static int smpi_run_entry_point(const F& entry_point, const std::string& executable_path, std::vector args) @@ -363,8 +362,10 @@ static void smpi_copy_file(const std::string& src, const std::string& target, of { 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_ATTRIB_UNUSED int unlink_status = unlink(target.c_str()); + xbt_assert(unlink_status == 0 || errno == ENOENT, "Failed to unlink file %s: %s", target.c_str(), strerror(errno)); + int fdout = open(target.c_str(), O_CREAT | O_RDWR | O_EXCL, S_IRWXU); + xbt_assert(fdout >= 0, "Cannot write into %s: %s", target.c_str(), strerror(errno)); XBT_DEBUG("Copy %" PRIdMAX " bytes into %s", static_cast(fdin_size), target.c_str()); #if SG_HAVE_SENDFILE @@ -379,15 +380,14 @@ static void smpi_copy_file(const std::string& src, const std::string& target, of } #endif // If this point is reached, sendfile() actually is not available. Copy file by hand. - const int bufsize = 1024 * 1024 * 4; - auto* buf = new char[bufsize]; - while (int got = read(fdin, buf, bufsize)) { + std::vector buf(1024 * 1024 * 4); + while (ssize_t got = read(fdin, buf.data(), buf.size())) { if (got == -1) { xbt_assert(errno == EINTR, "Cannot read from %s", src.c_str()); } else { - const char* p = buf; - int todo = got; - while (int done = write(fdout, p, todo)) { + const unsigned char* p = buf.data(); + ssize_t todo = got; + while (ssize_t done = write(fdout, p, todo)) { if (done == -1) { xbt_assert(errno == EINTR, "Cannot write into %s", target.c_str()); } else { @@ -397,7 +397,6 @@ static void smpi_copy_file(const std::string& src, const std::string& target, of } } } - delete[] buf; close(fdin); close(fdout); } @@ -431,11 +430,14 @@ static void smpi_init_privatization_dlopen(const std::string& executable) 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); + xbt_assert(libhandle != nullptr, + "Cannot dlopen %s - check your settings in smpi/privatize-libs", libname.c_str()); // get library name from path std::string fullpath = libname; #if not defined(__APPLE__) && not defined(__HAIKU__) - xbt_assert(0 != dl_iterate_phdr(visit_libs, &fullpath), - "Can't find a linked %s - check your settings in smpi/privatize-libs", fullpath.c_str()); + XBT_ATTRIB_UNUSED int dl_iterate_res = dl_iterate_phdr(visit_libs, &fullpath); + xbt_assert(dl_iterate_res != 0, "Can't find a linked %s - check your settings in smpi/privatize-libs", + fullpath.c_str()); XBT_DEBUG("Extra lib to privatize '%s' found", fullpath.c_str()); #else xbt_die("smpi/privatize-libs is not (yet) compatible with OSX nor with Haiku"); @@ -471,16 +473,14 @@ static void smpi_init_privatization_dlopen(const std::string& executable) // 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 = simgrid::config::get_value("smpi/tmpdir") + "/" + - std::string(pad - std::to_string(rank).length(), '0') + std::to_string(rank) + libname.substr(pad); + auto pad = std::min(7, libname.length()); + std::string target_libname = std::string(pad - std::to_string(rank).length(), '0') + std::to_string(rank) + libname.substr(pad); + std::string target_lib = simgrid::config::get_value("smpi/tmpdir") + "/" + target_libname; 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; + std::string sedcommand = "sed -i -e 's/" + libname + "/" + target_libname + "/g' " + target_executable; int status = system(sedcommand.c_str()); xbt_assert(status == 0, "error while applying sed command %s \n", sedcommand.c_str()); } @@ -495,8 +495,10 @@ static void smpi_init_privatization_dlopen(const std::string& executable) for (const std::string& target_lib : target_libs) unlink(target_lib.c_str()); } - xbt_assert(handle != nullptr, "dlopen failed: %s (errno: %d -- %s)", dlerror(), saved_errno, - strerror(saved_errno)); + xbt_assert(handle != nullptr, + "dlopen failed: %s (errno: %d -- %s).\nError: Did you compile the program with a SMPI-specific " + "compiler (spmicc or friends)?", + dlerror(), saved_errno, strerror(saved_errno)); smpi_entry_point_type entry_point = smpi_resolve_function(handle); xbt_assert(entry_point, "Could not resolve entry point"); @@ -540,7 +542,7 @@ int smpi_main(const char* executable, int argc, char* argv[]) simgrid::instr::init(); SIMIX_global_init(&argc, argv); - auto engine = simgrid::s4u::Engine::get_instance(); + auto engine = simgrid::s4u::Engine::get_instance(); sg_storage_file_system_init(); // parse the platform file: get the host list