X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6574906fc7ef8966b3140b596df794b8e05cd504..721ce3a9bda40b178bb97e61f831056bb050ac51:/src/smpi/internals/smpi_global.cpp diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index aaef32d548..c8253eecab 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -15,6 +15,8 @@ #include #include /* DBL_MAX */ +#include +#include /* intmax_t */ #include #include #include @@ -29,13 +31,13 @@ # 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__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) # define HAVE_WORKING_MMAP 0 #else # define HAVE_WORKING_MMAP 1 #endif -#if HAVE_SENDFILE +#if SG_HAVE_SENDFILE #include #endif @@ -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 !RTLD_DEEPBIND || HAVE_SANITIZER_ADDRESS || HAVE_SANITIZER_THREAD +#define WANT_RTLD_DEEPBIND 0 +#else +#define WANT_RTLD_DEEPBIND RTLD_DEEPBIND #endif #if HAVE_PAPI @@ -125,11 +129,7 @@ MPI_Comm smpi_process_comm_self(){ } 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(); + simgrid::smpi::ActorExt::init(); } void * smpi_process_get_user_data(){ @@ -168,7 +168,7 @@ static void check_blocks(std::vector> &private_blocks, void smpi_comm_copy_buffer_callback(smx_activity_t synchro, void *buff, size_t buff_size) { simgrid::kernel::activity::CommImplPtr comm = - boost::dynamic_pointer_cast(synchro); + boost::static_pointer_cast(synchro); int src_shared = 0; int dst_shared = 0; size_t src_offset = 0; @@ -184,8 +184,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 ((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_); dst_private_blocks = shift_and_frame_private_blocks(dst_private_blocks, dst_offset, buff_size); } else { @@ -201,18 +201,19 @@ 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 this is a detached send, the source buffer was duplicated by SMPI @@ -220,7 +221,7 @@ void smpi_comm_copy_buffer_callback(smx_activity_t synchro, void *buff, size_t b 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); @@ -323,17 +324,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 @@ -423,12 +422,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(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); @@ -437,7 +441,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 @@ -484,19 +488,26 @@ 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]; while (int got = read(fdin, buf, bufsize)) { @@ -515,7 +526,6 @@ static void smpi_copy_file(std::string src, std::string target, off_t fdin_size) } } } -#endif close(fdin); close(fdout); } @@ -534,13 +544,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()) { @@ -553,7 +562,7 @@ 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()); + strncpy(fullpath, libname.c_str(), 511); #if not defined(__APPLE__) int ret = dl_iterate_phdr(visit_libs, fullpath); if (ret == 0) @@ -570,14 +579,14 @@ 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"; 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("/\\"); @@ -596,8 +605,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); @@ -610,11 +620,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) @@ -622,12 +632,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(); @@ -642,8 +652,9 @@ 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); }); }; } @@ -662,12 +673,6 @@ int smpi_main(const char* executable, int argc, char* 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)); }); - // 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); @@ -728,6 +733,8 @@ void SMPI_init(){ 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();