X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/950b9d175a7966b91adf53b74745ce4e6e5da5f9..33d0a5072b2c5d0a0d12740ba41434a5876ce997:/src/smpi/internals/smpi_global.cpp diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 2169f674a0..6638b9cf75 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -1,10 +1,11 @@ -/* Copyright (c) 2007-2018. 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 "mc/mc.h" #include "simgrid/s4u/Engine.hpp" +#include "simgrid/plugins/file_system.h" #include "smpi_coll.hpp" #include "smpi_f2c.hpp" #include "smpi_host.hpp" @@ -15,11 +16,14 @@ #include #include /* DBL_MAX */ +#include +#include /* intmax_t */ #include #include #include +#include -#if not defined(__APPLE__) +#if not defined(__APPLE__) && not defined(__HAIKU__) #include #endif @@ -28,14 +32,14 @@ # 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__) -# define HAVE_WORKING_MMAP 0 +constexpr bool HAVE_WORKING_MMAP = (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12); +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__sun) || defined(__HAIKU__) +constexpr bool HAVE_WORKING_MMAP = false; #else -# define HAVE_WORKING_MMAP 1 +constexpr bool HAVE_WORKING_MMAP = true; #endif -#if HAVE_SENDFILE +#if SG_HAVE_SENDFILE #include #endif @@ -53,17 +57,25 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi, "Logging specific to SMPI (ke 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 +*/ +#if !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" std::string papi_default_config_name = "default"; std::map units2papi_setup; #endif -using simgrid::s4u::Actor; -using simgrid::s4u::ActorPtr; std::unordered_map location2speedup; -static std::map process_data; +static std::map process_data; int process_count = 0; static int smpi_exit_status = 0; int smpi_universe_size = 0; @@ -90,7 +102,8 @@ static const std::string smpi_default_instance_name("smpirun"); static simgrid::config::Flag smpi_init_sleep( "smpi/init", "Time to inject inside a call to MPI_Init", 0.0); -void (*smpi_comm_copy_data_callback) (smx_activity_t, void*, size_t) = &smpi_comm_copy_buffer_callback; +void (*smpi_comm_copy_data_callback)(simgrid::kernel::activity::CommImpl*, void*, + size_t) = &smpi_comm_copy_buffer_callback; int smpi_process_count() { @@ -99,51 +112,47 @@ int smpi_process_count() simgrid::smpi::ActorExt* smpi_process() { - ActorPtr me = Actor::self(); + simgrid::s4u::ActorPtr me = simgrid::s4u::Actor::self(); if (me == nullptr) // This happens sometimes (eg, when linking against NS3 because it pulls openMPI...) return nullptr; - return process_data.at(me); + return process_data.at(me.get()); } -simgrid::smpi::ActorExt* smpi_process_remote(ActorPtr actor) +simgrid::smpi::ActorExt* smpi_process_remote(simgrid::s4u::ActorPtr actor) { - return process_data.at(actor); + return process_data.at(actor.get()); } MPI_Comm smpi_process_comm_self(){ return smpi_process()->comm_self(); } -void smpi_process_init(int *argc, char ***argv){ - simgrid::smpi::ActorExt::init(argc, argv); +MPI_Info smpi_process_info_env(){ + return smpi_process()->info_env(); } -int smpi_process_index(){ - return simgrid::s4u::this_actor::get_pid(); +void smpi_process_init(int*, char***) +{ + simgrid::smpi::ActorExt::init(); } void * smpi_process_get_user_data(){ - return Actor::self()->get_impl()->get_user_data(); + return simgrid::s4u::Actor::self()->get_impl()->get_user_data(); } void smpi_process_set_user_data(void *data){ - Actor::self()->get_impl()->set_user_data(data); -} - - -int smpi_global_size() -{ - char *value = getenv("SMPI_GLOBAL_SIZE"); - xbt_assert(value,"Please set env var SMPI_GLOBAL_SIZE to the expected number of processes."); - - return xbt_str_parse_int(value, "SMPI_GLOBAL_SIZE contains a non-numerical value: %s"); + simgrid::s4u::Actor::self()->get_impl()->set_user_data(data); } void smpi_comm_set_copy_data_callback(void (*callback) (smx_activity_t, void*, size_t)) { - smpi_comm_copy_data_callback = callback; + 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); + }; } static void memcpy_private(void* dest, const void* src, std::vector>& private_blocks) @@ -157,18 +166,14 @@ static void check_blocks(std::vector> &private_blocks, xbt_assert(block.first <= block.second && block.second <= buff_size, "Oops, bug in shared malloc."); } -void smpi_comm_copy_buffer_callback(smx_activity_t synchro, void *buff, size_t buff_size) +void smpi_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size) { - simgrid::kernel::activity::CommImplPtr comm = - boost::dynamic_pointer_cast(synchro); - int src_shared = 0; - int dst_shared = 0; size_t src_offset = 0; size_t dst_offset = 0; std::vector> src_private_blocks; std::vector> dst_private_blocks; XBT_DEBUG("Copy the data over"); - if((src_shared=smpi_is_shared(buff, src_private_blocks, &src_offset))) { + if(smpi_is_shared(buff, src_private_blocks, &src_offset)) { XBT_DEBUG("Sender %p is shared. Let's ignore it.", buff); src_private_blocks = shift_and_frame_private_blocks(src_private_blocks, src_offset, buff_size); } @@ -176,8 +181,8 @@ void smpi_comm_copy_buffer_callback(smx_activity_t synchro, void *buff, size_t b src_private_blocks.clear(); src_private_blocks.push_back(std::make_pair(0, buff_size)); } - if((dst_shared=smpi_is_shared((char*)comm->dst_buff, dst_private_blocks, &dst_offset))) { - XBT_DEBUG("Receiver %p is shared. Let's ignore it.", (char*)comm->dst_buff); + if (smpi_is_shared((char*)comm->dst_buff_, dst_private_blocks, &dst_offset)) { + XBT_DEBUG("Receiver %p is shared. Let's ignore it.", (char*)comm->dst_buff_); dst_private_blocks = shift_and_frame_private_blocks(dst_private_blocks, dst_offset, buff_size); } else { @@ -193,32 +198,33 @@ void smpi_comm_copy_buffer_callback(smx_activity_t synchro, void *buff, size_t b (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_proc->iface()); + smpi_switch_data_segment(comm->src_actor_->iface()); tmpbuff = static_cast(xbt_malloc(buff_size)); memcpy_private(tmpbuff, buff, private_blocks); } - if ((smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) && ((char*)comm->dst_buff >= smpi_data_exe_start) && - ((char*)comm->dst_buff < smpi_data_exe_start + smpi_data_exe_size)) { + if ((smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) && + ((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_proc->iface()); + smpi_switch_data_segment(comm->dst_actor_->iface()); } - XBT_DEBUG("Copying %zu bytes from %p to %p", buff_size, tmpbuff,comm->dst_buff); - memcpy_private(comm->dst_buff, tmpbuff, private_blocks); + XBT_DEBUG("Copying %zu bytes from %p to %p", buff_size, tmpbuff, comm->dst_buff_); + memcpy_private(comm->dst_buff_, tmpbuff, private_blocks); - if (comm->detached) { + if (comm->detached()) { // if this is a detached send, the source buffer was duplicated by SMPI // sender to make the original buffer available to the application ASAP xbt_free(buff); //It seems that the request is used after the call there this should be free somewhere else but where??? //xbt_free(comm->comm.src_data);// inside SMPI the request is kept inside the user data and should be free - comm->src_buff = nullptr; + comm->src_buff_ = nullptr; } if (tmpbuff != buff) xbt_free(tmpbuff); } -void smpi_comm_null_copy_buffer_callback(smx_activity_t comm, void *buff, size_t buff_size) +void smpi_comm_null_copy_buffer_callback(simgrid::kernel::activity::CommImpl*, void*, size_t) { /* nothing done in this version */ } @@ -233,8 +239,10 @@ static void smpi_check_options() if (simgrid::config::is_default("smpi/host-speed")) { XBT_INFO("You did not set the power of the host running the simulation. " "The timings will certainly not be accurate. " - "Use the option \"--cfg=smpi/host-speed:\" to set its value." - "Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information."); + "Use the option \"--cfg=smpi/host-speed:\" to set its value. " + "Check " + "https://simgrid.org/doc/latest/Configuring_SimGrid.html#automatic-benchmarking-of-smpi-code for more " + "information."); } xbt_assert(simgrid::config::get_value("smpi/cpu-threshold") >= 0, @@ -315,17 +323,15 @@ void smpi_global_init() int event_code = PAPI_NULL; char* event_name = const_cast((*events_it).c_str()); - if (PAPI_event_name_to_code(event_name, &event_code) == PAPI_OK) { - if (PAPI_add_event(event_set, event_code) != PAPI_OK) { - XBT_ERROR("Could not add PAPI event '%s'. Skipping.", event_name); - continue; - } else { - XBT_DEBUG("Successfully added PAPI event '%s' to the event set.", event_name); - } - } else { + if (PAPI_event_name_to_code(event_name, &event_code) != PAPI_OK) { XBT_CRITICAL("Could not find PAPI event '%s'. Skipping.", event_name); continue; } + if (PAPI_add_event(event_set, event_code) != PAPI_OK) { + XBT_ERROR("Could not add PAPI event '%s'. Skipping.", event_name); + continue; + } + 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 @@ -358,7 +364,6 @@ void smpi_global_destroy() 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(); } @@ -388,12 +393,10 @@ static void smpi_init_options(){ XBT_DEBUG("Running without smpi_main(); disable smpi/privatization."); smpi_privatize_global_variables = SmpiPrivStrategies::NONE; } -#if !HAVE_WORKING_MMAP - if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) { + if (not HAVE_WORKING_MMAP && smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) { XBT_INFO("mmap privatization is broken on this platform, switching to dlopen privatization instead."); smpi_privatize_global_variables = SmpiPrivStrategies::DLOPEN; } -#endif if (smpi_cpu_threshold < 0) smpi_cpu_threshold = DBL_MAX; @@ -415,12 +418,17 @@ 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)(); -static int smpi_run_entry_point(smpi_entry_point_type entry_point, std::vector args) +static int smpi_run_entry_point(const smpi_entry_point_type& 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()); 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 args2str(*args4argv); @@ -429,7 +437,7 @@ static int smpi_run_entry_point(smpi_entry_point_type entry_point, std::vectorpush_back(nullptr); char** argv = args4argv->data(); - simgrid::smpi::ActorExt::init(&argc, &argv); + simgrid::smpi::ActorExt::init(); #if SMPI_IFORT for_rtl_init_ (&argc, argv); #elif SMPI_FLANG @@ -462,7 +470,7 @@ 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_"); if (entry_point_fortran != nullptr) { - return [entry_point_fortran](int argc, char** argv) { + return [entry_point_fortran](int, char**) { entry_point_fortran(); return 0; }; @@ -476,21 +484,28 @@ static smpi_entry_point_type smpi_resolve_function(void* handle) return smpi_entry_point_type(); } -static void smpi_copy_file(std::string src, std::string target, off_t fdin_size) +static void smpi_copy_file(const std::string& src, const 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(fdin_size), target.c_str()); -#if HAVE_SENDFILE + 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); - 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 + if (sent_size == fdin_size) { + close(fdin); + close(fdout); + return; + } 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(fdin_size), errno, strerror(errno)); + } +#endif + // If this point is reached, sendfile() actually is not available. Copy file by hand. const int bufsize = 1024 * 1024 * 4; - char buf[bufsize]; + char* 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()); @@ -507,12 +522,12 @@ static void smpi_copy_file(std::string src, std::string target, off_t fdin_size) } } } -#endif + delete[] buf; close(fdin); close(fdout); } -#if not defined(__APPLE__) +#if not defined(__APPLE__) && not defined(__HAIKU__) static int visit_libs(struct dl_phdr_info* info, size_t, void* data) { char* libname = (char*)(data); @@ -526,13 +541,12 @@ static int visit_libs(struct dl_phdr_info* info, size_t, void* data) } #endif -static void smpi_init_privatization_dlopen(std::string executable) +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("smpi/privatize-libs"); if (not libnames.empty()) { @@ -545,8 +559,8 @@ static void smpi_init_privatization_dlopen(std::string executable) 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__) + strncpy(fullpath, libname.c_str(), 511); +#if not defined(__APPLE__) && not defined(__HAIKU__) 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); @@ -562,7 +576,7 @@ static void smpi_init_privatization_dlopen(std::string executable) simix_global->default_function = [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"; @@ -603,7 +617,7 @@ 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); + 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()); @@ -615,12 +629,12 @@ static void smpi_init_privatization_dlopen(std::string executable) 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); + smpi_run_entry_point(entry_point, executable, args); }); }; } -static void smpi_init_privatization_no_dlopen(std::string executable) +static void smpi_init_privatization_no_dlopen(const std::string& executable) { if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) smpi_prepare_global_memory_segment(); @@ -635,15 +649,14 @@ static void smpi_init_privatization_no_dlopen(std::string executable) smpi_backup_global_memory_segment(); // Execute the same entry point for each simulated process: - simix_global->default_function = [entry_point](std::vector args) { - return std::function([entry_point, args] { smpi_run_entry_point(entry_point, args); }); + simix_global->default_function = [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[]) { - srand(SMPI_RAND_SEED); - if (getenv("SMPI_PRETEND_CC") != nullptr) { /* Hack to ensure that smpicc can pretend to be a simple compiler. Particularly handy to pass it to the * configuration tools */ @@ -654,13 +667,7 @@ int smpi_main(const char* executable, int argc, char* argv[]) SIMIX_global_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::on_creation? - simgrid::s4u::Host::on_creation.connect( - [](simgrid::s4u::Host& host) { host.extension_set(new simgrid::smpi::Host(&host)); }); - + sg_storage_file_system_init(); // parse the platform file: get the host list simgrid::s4u::Engine::get_instance()->load_platform(argv[1]); SIMIX_comm_set_copy_data_callback(smpi_comm_copy_buffer_callback); @@ -709,18 +716,20 @@ int smpi_main(const char* executable, int argc, char* argv[]) // Called either directly from the user code, or from the code called by smpirun 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::ActorExt(actor, nullptr)}); + simgrid::s4u::Actor::on_creation.connect([](simgrid::s4u::Actor& actor) { + if (not actor.is_daemon()) { + process_data.insert({&actor, new simgrid::smpi::ActorExt(&actor, nullptr)}); } }); - simgrid::s4u::Actor::on_destruction.connect([](simgrid::s4u::ActorPtr actor) { - auto it = process_data.find(actor); + simgrid::s4u::Actor::on_destruction.connect([](simgrid::s4u::Actor const& actor) { + auto it = process_data.find(&actor); if (it != process_data.end()) { delete it->second; process_data.erase(it); } }); + simgrid::s4u::Host::on_creation.connect( + [](simgrid::s4u::Host& host) { host.extension_set(new simgrid::smpi::Host(&host)); }); smpi_init_options(); smpi_global_init();