X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/672e33e4ec04de8fa4f69d453cf97de31478e721..d4c379d0ed64d71ef35171ac104bedf98886c03b:/src/smpi/internals/smpi_global.cpp diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index efa6db5a8b..b47e090c9c 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -3,27 +3,26 @@ /* 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/Mailbox.hpp" -#include "simgrid/s4u/Host.hpp" -#include "src/msg/msg_private.h" -#include "src/simix/smx_private.h" -#include "src/surf/surf_interface.hpp" #include "SmpiHost.hpp" -#include "xbt/config.hpp" -#include "private.h" +#include "mc/mc.h" #include "private.hpp" +#include "simgrid/s4u/Host.hpp" +#include "simgrid/s4u/Mailbox.hpp" #include "smpi_coll.hpp" #include "smpi_comm.hpp" #include "smpi_group.hpp" #include "smpi_info.hpp" #include "smpi_process.hpp" +#include "src/msg/msg_private.hpp" +#include "src/simix/smx_private.hpp" +#include "src/surf/surf_interface.hpp" +#include "xbt/config.hpp" +#include /* DBL_MAX */ #include #include -#include -#include /* DBL_MAX */ #include +#include #if HAVE_SENDFILE #include @@ -125,22 +124,20 @@ void smpi_comm_set_copy_data_callback(void (*callback) (smx_activity_t, void*, s static void print(std::vector> vec) { std::fprintf(stderr, "{"); - for (auto elt : vec) { + for (auto const& elt : vec) { std::fprintf(stderr, "(0x%zx, 0x%zx),", elt.first, elt.second); - } - std::fprintf(stderr, "}\n"); + } + std::fprintf(stderr, "}\n"); } static void memcpy_private(void* dest, const void* src, std::vector>& private_blocks) { - for(auto block : 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) { - for(auto block : private_blocks) { + for (auto const& block : 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) @@ -175,24 +172,23 @@ void smpi_comm_copy_buffer_callback(smx_activity_t synchro, void *buff, size_t b auto private_blocks = merge_private_blocks(src_private_blocks, dst_private_blocks); check_blocks(private_blocks, buff_size); void* tmpbuff=buff; - if((smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) && (static_cast(buff) >= smpi_start_data_exe) - && (static_cast(buff) < smpi_start_data_exe + smpi_size_data_exe ) - ){ - XBT_DEBUG("Privatization : We are copying from a zone inside global memory... Saving data to temp buffer !"); - - smpi_switch_data_segment( - static_cast((static_cast(comm->src_proc->userdata)->data)) - ->index()); - tmpbuff = static_cast(xbt_malloc(buff_size)); - memcpy_private(tmpbuff, buff, private_blocks); + if ((smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) && (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( + static_cast((static_cast(comm->src_proc->userdata)->data)) + ->index()); + tmpbuff = static_cast(xbt_malloc(buff_size)); + memcpy_private(tmpbuff, buff, private_blocks); } - if((smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) && ((char*)comm->dst_buff >= smpi_start_data_exe) - && ((char*)comm->dst_buff < smpi_start_data_exe + smpi_size_data_exe )){ - XBT_DEBUG("Privatization : We are copying to a zone inside global memory - Switch data segment"); - smpi_switch_data_segment( - static_cast((static_cast(comm->dst_proc->userdata)->data)) - ->index()); + if ((smpi_privatize_global_variables == SMPI_PRIVATIZE_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( + static_cast((static_cast(comm->dst_proc->userdata)->data)) + ->index()); } XBT_DEBUG("Copying %zu bytes from %p to %p", buff_size, tmpbuff,comm->dst_buff); memcpy_private(comm->dst_buff, tmpbuff, private_blocks); @@ -205,8 +201,8 @@ void smpi_comm_copy_buffer_callback(smx_activity_t synchro, void *buff, size_t b //xbt_free(comm->comm.src_data);// inside SMPI the request is kept inside the user data and should be free comm->src_buff = nullptr; } - if(tmpbuff!=buff)xbt_free(tmpbuff); - + if (tmpbuff != buff) + xbt_free(tmpbuff); } void smpi_comm_null_copy_buffer_callback(smx_activity_t comm, void *buff, size_t buff_size) @@ -282,11 +278,9 @@ void smpi_global_init() std::string str = std::string(xbt_cfg_get_string("smpi/papi-events")); Tokenizer tokens(str, separator_units); - // Iterate over all the computational units. This could be - // processes, hosts, threads, ranks... You name it. I'm not exactly - // sure what we will support eventually, so I'll leave it at the - // general term "units". - for (auto& unit_it : tokens) { + // Iterate over all the computational units. This could be processes, hosts, threads, ranks... You name it. + // I'm not exactly sure what we will support eventually, so I'll leave it at the general term "units". + for (auto const& unit_it : tokens) { boost::char_separator separator_events(":"); Tokenizer event_tokens(unit_it, separator_events); @@ -306,7 +300,7 @@ void smpi_global_init() // 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++) { + 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()); @@ -361,8 +355,6 @@ void smpi_global_init() void smpi_global_destroy() { - int count = smpi_process_count(); - smpi_bench_destroy(); smpi_shared_destroy(); if (MPI_COMM_WORLD != MPI_COMM_UNINITIALIZED){ @@ -371,7 +363,7 @@ void smpi_global_destroy() }else{ smpi_deployment_cleanup_instances(); } - for (int i = 0; i < count; i++) { + for (int i = 0, count = smpi_process_count(); i < count; i++) { if(process_data[i]->comm_self()!=MPI_COMM_NULL){ simgrid::smpi::Comm::destroy(process_data[i]->comm_self()); } @@ -538,7 +530,7 @@ int smpi_main(const char* executable, int argc, char *argv[]) return 0; } - TRACE_global_init(&argc, argv); + TRACE_global_init(); SIMIX_global_init(&argc, argv); MSG_init(&argc,argv); @@ -609,10 +601,11 @@ int smpi_main(const char* executable, int argc, char *argv[]) // Load the copy and resolve the entry point: void* handle = dlopen(target_executable.c_str(), RTLD_LAZY | RTLD_LOCAL | RTLD_DEEPBIND); + int saved_errno = errno; if (xbt_cfg_get_boolean("smpi/keep-temps") == false) unlink(target_executable.c_str()); if (handle == nullptr) - xbt_die("dlopen failed: %s (errno: %d -- %s)", dlerror(), errno, strerror(errno)); + xbt_die("dlopen failed: %s (errno: %d -- %s)", dlerror(), saved_errno, strerror(saved_errno)); smpi_entry_point_type entry_point = smpi_resolve_function(handle); if (not entry_point) xbt_die("Could not resolve entry point");