X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b214b15ec055be50978640d04708fb5f64abe53c..1f8bb506ed4fe3d6e6713c9c1edacadef423b4a3:/src/smpi/internals/smpi_global.cpp diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index ab1ebfb125..26d4ceca1c 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2020. 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. */ @@ -14,6 +14,7 @@ #include "src/simix/smx_private.hpp" #include "src/smpi/include/smpi_actor.hpp" #include "xbt/config.hpp" +#include "xbt/file.hpp" #include #include /* split */ @@ -128,17 +129,18 @@ void smpi_comm_set_copy_data_callback(void (*callback) (smx_activity_t, void*, s static void (*saved_callback)(smx_activity_t, void*, size_t); saved_callback = callback; smpi_comm_copy_data_callback = [](simgrid::kernel::activity::CommImpl* comm, void* buff, size_t size) { - saved_callback(smx_activity_t(comm), buff, size); + saved_callback(comm, buff, size); }; } -static void memcpy_private(void* dest, const void* src, std::vector>& private_blocks) +static void memcpy_private(void* dest, const void* src, const std::vector>& private_blocks) { for (auto const& block : private_blocks) memcpy((uint8_t*)dest+block.first, (uint8_t*)src+block.first, block.second-block.first); } -static void check_blocks(std::vector> &private_blocks, size_t buff_size) { +static void check_blocks(const std::vector>& private_blocks, size_t buff_size) +{ for (auto const& block : private_blocks) xbt_assert(block.first <= block.second && block.second <= buff_size, "Oops, bug in shared malloc."); } @@ -163,7 +165,7 @@ void smpi_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, v XBT_DEBUG("Copy the data over"); if(smpi_is_shared(buff, src_private_blocks, &src_offset)) { src_private_blocks = shift_and_frame_private_blocks(src_private_blocks, src_offset, buff_size); - if (src_private_blocks.size()==0){//simple shared malloc ... return. + if (src_private_blocks.empty()) { // simple shared malloc ... return. XBT_VERB("Sender is shared. Let's ignore it."); smpi_cleanup_comm_after_copy(comm, buff); return; @@ -171,11 +173,11 @@ void smpi_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, v } else { src_private_blocks.clear(); - src_private_blocks.push_back(std::make_pair(0, buff_size)); + src_private_blocks.emplace_back(0, buff_size); } if (smpi_is_shared((char*)comm->dst_buff_, dst_private_blocks, &dst_offset)) { dst_private_blocks = shift_and_frame_private_blocks(dst_private_blocks, dst_offset, buff_size); - if (dst_private_blocks.size()==0){//simple shared malloc ... return. + if (dst_private_blocks.empty()) { // simple shared malloc ... return. XBT_VERB("Receiver is shared. Let's ignore it."); smpi_cleanup_comm_after_copy(comm, buff); return; @@ -183,7 +185,7 @@ void smpi_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, v } else { dst_private_blocks.clear(); - dst_private_blocks.push_back(std::make_pair(0, buff_size)); + dst_private_blocks.emplace_back(0, buff_size); } check_blocks(src_private_blocks, buff_size); check_blocks(dst_private_blocks, buff_size); @@ -194,8 +196,8 @@ void smpi_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, v (static_cast(buff) >= smpi_data_exe_start) && (static_cast(buff) < smpi_data_exe_start + smpi_data_exe_size)) { XBT_DEBUG("Privatization : We are copying from a zone inside global memory... Saving data to temp buffer !"); - smpi_switch_data_segment(comm->src_actor_->iface()); - tmpbuff = static_cast(xbt_malloc(buff_size)); + smpi_switch_data_segment(comm->src_actor_->get_iface()); + tmpbuff = xbt_malloc(buff_size); memcpy_private(tmpbuff, buff, private_blocks); } @@ -203,7 +205,7 @@ void smpi_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, v ((char*)comm->dst_buff_ >= smpi_data_exe_start) && ((char*)comm->dst_buff_ < smpi_data_exe_start + smpi_data_exe_size)) { XBT_DEBUG("Privatization : We are copying to a zone inside global memory - Switch data segment"); - smpi_switch_data_segment(comm->dst_actor_->iface()); + smpi_switch_data_segment(comm->dst_actor_->get_iface()); } XBT_DEBUG("Copying %zu bytes from %p to %p", buff_size, tmpbuff, comm->dst_buff_); memcpy_private(comm->dst_buff_, tmpbuff, private_blocks); @@ -234,7 +236,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); @@ -252,19 +254,16 @@ static void smpi_init_papi() } // NOTE: We cannot use a map here, as we must obey the order of the counters - // This is important for PAPI: We need to map the values of counters back - // to the event_names (so, when PAPI_read() has finished)! + // This is important for PAPI: We need to map the values of counters back to the event_names (so, when PAPI_read() + // has finished)! papi_counter_t counters2values; - // Iterate over all counters that were specified for this specific - // unit. - // Note that we need to remove the name of the unit - // (that could also be the "default" value), which always comes first. - // Hence, we start at ++(events.begin())! + // Iterate over all counters that were specified for this specific unit. + // Note that we need to remove the name of the unit (that could also be the "default" value), which always comes + // first. Hence, we start at ++(events.begin())! for (Tokenizer::iterator events_it = ++(event_tokens.begin()); events_it != event_tokens.end(); ++events_it) { - int event_code = PAPI_NULL; - char* event_name = const_cast((*events_it).c_str()); + auto* event_name = const_cast((*events_it).c_str()); if (PAPI_event_name_to_code(event_name, &event_code) != PAPI_OK) { XBT_CRITICAL("Could not find PAPI event '%s'. Skipping.", event_name); continue; @@ -289,17 +288,15 @@ 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) { // copy C strings, we need them writable - std::vector* args4argv = new std::vector(args.size()); + auto* args4argv = new std::vector(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 @@ -344,7 +341,7 @@ static int smpi_run_entry_point(const F& entry_point, const std::string& executa // TODO, remove the number of functions involved here static smpi_entry_point_type smpi_resolve_function(void* handle) { - smpi_fortran_entry_point_type entry_point_fortran = (smpi_fortran_entry_point_type)dlsym(handle, "user_main_"); + auto* entry_point_fortran = reinterpret_cast(dlsym(handle, "user_main_")); if (entry_point_fortran != nullptr) { return [entry_point_fortran](int, char**) { entry_point_fortran(); @@ -352,7 +349,7 @@ static smpi_entry_point_type smpi_resolve_function(void* handle) }; } - smpi_c_entry_point_type entry_point = (smpi_c_entry_point_type)dlsym(handle, "main"); + auto* entry_point = reinterpret_cast(dlsym(handle, "main")); if (entry_point != nullptr) { return entry_point; } @@ -369,7 +366,7 @@ static void smpi_copy_file(const std::string& src, const std::string& target, of XBT_DEBUG("Copy %" PRIdMAX " bytes into %s", static_cast(fdin_size), target.c_str()); #if SG_HAVE_SENDFILE - ssize_t sent_size = sendfile(fdout, fdin, NULL, fdin_size); + ssize_t sent_size = sendfile(fdout, fdin, nullptr, fdin_size); if (sent_size == fdin_size) { close(fdin); close(fdout); @@ -381,12 +378,12 @@ 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; - char* buf = new char[bufsize]; + auto* buf = new char[bufsize]; while (int got = read(fdin, buf, bufsize)) { if (got == -1) { xbt_assert(errno == EINTR, "Cannot read from %s", src.c_str()); } else { - char* p = buf; + const char* p = buf; int todo = got; while (int done = write(fdout, p, todo)) { if (done == -1) { @@ -406,13 +403,12 @@ static void smpi_copy_file(const std::string& src, const std::string& target, of #if not defined(__APPLE__) && not defined(__HAIKU__) 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)){ - strncpy(libname, path, 512); + auto* libname = static_cast(data); + std::string path = info->dlpi_name; + if (path.find(*libname) != std::string::npos) { + *libname = std::move(path); return 1; } - return 0; } #endif @@ -433,27 +429,30 @@ 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 - char fullpath[512] = {'\0'}; - strncpy(fullpath, libname.c_str(), 511); + 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); - XBT_DEBUG("Extra lib to privatize '%s' found", fullpath); + 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"); #endif - privatize_libs_paths.push_back(fullpath); + privatize_libs_paths.emplace_back(std::move(fullpath)); dlclose(libhandle); } } - simix_global->default_function = [executable, fdin_size](std::vector args) { + simgrid::s4u::Engine::get_instance()->register_default([executable, fdin_size](std::vector args) { return std::function([executable, fdin_size, args] { static std::size_t rank = 0; // Copy the dynamic library: - std::string target_executable = - executable + "_" + std::to_string(getpid()) + "_" + std::to_string(rank) + ".so"; + simgrid::xbt::Path path(executable); + std::string target_executable = simgrid::config::get_value("smpi/tmpdir") + "/" + + path.get_base_name() + "_" + 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. @@ -476,14 +475,15 @@ static void smpi_init_privatization_dlopen(const std::string& executable) 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); + 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; - xbt_assert(system(sedcommand.c_str()) == 0, "error while applying sed command %s \n", sedcommand.c_str()); + 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()); } } @@ -491,7 +491,7 @@ static void smpi_init_privatization_dlopen(const std::string& executable) // 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("smpi/keep-temps") == false) { + if (not simgrid::config::get_value("smpi/keep-temps")) { unlink(target_executable.c_str()); for (const std::string& target_lib : target_libs) unlink(target_lib.c_str()); @@ -503,7 +503,7 @@ static void smpi_init_privatization_dlopen(const std::string& executable) xbt_assert(entry_point, "Could not resolve entry point"); smpi_run_entry_point(entry_point, executable, args); }); - }; + }); } static void smpi_init_privatization_no_dlopen(const std::string& executable) @@ -522,10 +522,10 @@ static void smpi_init_privatization_no_dlopen(const std::string& executable) smpi_backup_global_memory_segment(); // Execute the same entry point for each simulated process: - simix_global->default_function = [entry_point, executable](std::vector args) { + simgrid::s4u::Engine::get_instance()->register_default([entry_point, executable](std::vector args) { return std::function( [entry_point, executable, args] { smpi_run_entry_point(entry_point, executable, args); }); - }; + }); } int smpi_main(const char* executable, int argc, char* argv[]) @@ -538,7 +538,7 @@ int smpi_main(const char* executable, int argc, char* argv[]) SMPI_switch_data_segment = &smpi_switch_data_segment; smpi_init_options(); - TRACE_global_init(); + simgrid::instr::init(); SIMIX_global_init(&argc, argv); auto engine = simgrid::s4u::Engine::get_instance(); @@ -560,7 +560,7 @@ int smpi_main(const char* executable, int argc, char* argv[]) /* This is a ... heavy way to count the MPI ranks */ int rank_counts = 0; - simgrid::s4u::Actor::on_creation.connect([&rank_counts](simgrid::s4u::Actor& actor) { + simgrid::s4u::Actor::on_creation.connect([&rank_counts](const simgrid::s4u::Actor& actor) { if (not actor.is_daemon()) rank_counts++; }); @@ -576,7 +576,6 @@ int smpi_main(const char* executable, int argc, char* argv[]) if (MC_is_active()) { MC_run(); } else { - SIMIX_run(); xbt_os_walltimer_stop(global_timer); @@ -643,3 +642,7 @@ void smpi_mpi_init() { if(smpi_init_sleep > 0) simgrid::s4u::this_actor::sleep_for(smpi_init_sleep); } + +void SMPI_thread_create() { + TRACE_smpi_init(simgrid::s4u::this_actor::get_pid(), __func__); +}