X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/50df28cc841757c85592657dff0ce98920f848aa..fbcf6ab31cae1988be858f9f894dafe529c575d7:/src/smpi/internals/smpi_global.cpp diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index e71ce0ec81..25cbf6216d 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -5,6 +5,7 @@ #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" @@ -20,6 +21,7 @@ #include #include #include +#include #if not defined(__APPLE__) #include @@ -30,11 +32,11 @@ # 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__) || defined(__FreeBSD_kernel__) -# 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) +constexpr bool HAVE_WORKING_MMAP = false; #else -# define HAVE_WORKING_MMAP 1 +constexpr bool HAVE_WORKING_MMAP = true; #endif #if SG_HAVE_SENDFILE @@ -71,11 +73,9 @@ 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; @@ -102,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() { @@ -111,47 +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){ +MPI_Info smpi_process_info_env(){ + return smpi_process()->info_env(); +} + +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) @@ -165,10 +166,8 @@ 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; @@ -215,7 +214,7 @@ void smpi_comm_copy_buffer_callback(smx_activity_t synchro, void *buff, size_t b 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); @@ -227,7 +226,7 @@ void smpi_comm_copy_buffer_callback(smx_activity_t synchro, void *buff, size_t b 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 */ } @@ -242,8 +241,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, @@ -365,7 +366,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(); } @@ -395,12 +395,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; @@ -422,7 +420,7 @@ 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, const std::string& executable_path, +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 @@ -474,7 +472,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; }; @@ -488,7 +486,7 @@ 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()); @@ -660,8 +658,6 @@ static void smpi_init_privatization_no_dlopen(const std::string& executable) 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 */ @@ -672,7 +668,7 @@ int smpi_main(const char* executable, int argc, char* argv[]) SIMIX_global_init(&argc, argv); SMPI_switch_data_segment = &smpi_switch_data_segment; - + 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); @@ -721,13 +717,13 @@ 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);