X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb364501b7d8cae830ae86c71cc88abf29d2c601..b9b0ba08f86e11674ff24a6b7389e7dec2984af3:/src/smpi/internals/smpi_global.cpp diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 98a0b81030..c28af0c90c 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -3,22 +3,36 @@ /* 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 "smpi_host.hpp" #include "mc/mc.h" #include "simgrid/s4u/Engine.hpp" #include "smpi_coll.hpp" -#include "smpi_process.hpp" -#include "src/msg/msg_private.hpp" +#include "smpi_f2c.hpp" +#include "smpi_host.hpp" +#include "src/kernel/activity/CommImpl.hpp" #include "src/simix/smx_private.hpp" +#include "src/smpi/include/smpi_actor.hpp" #include "xbt/config.hpp" #include /* DBL_MAX */ #include #include +#include + #if not defined(__APPLE__) #include #endif -#include + +#if defined(__APPLE__) +# include +# 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 +#else +# define HAVE_WORKING_MMAP 1 +#endif #if HAVE_SENDFILE #include @@ -38,19 +52,15 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi, "Logging specific to SMPI (ke #if HAVE_PAPI #include "papi.h" -const char* papi_default_config_name = "default"; - -struct papi_process_data { - papi_counter_t counter_data; - int event_set; -}; +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; @@ -86,16 +96,17 @@ int smpi_process_count() return process_count; } -simgrid::smpi::Process* smpi_process() +simgrid::smpi::ActorExt* smpi_process() { ActorPtr me = Actor::self(); + if (me == nullptr) // This happens sometimes (eg, when linking against NS3 because it pulls openMPI...) return nullptr; - simgrid::msg::ActorExt* msgExt = static_cast(me->get_impl()->getUserData()); - return static_cast(msgExt->data); + + return process_data.at(me); } -simgrid::smpi::Process* smpi_process_remote(ActorPtr actor) +simgrid::smpi::ActorExt* smpi_process_remote(ActorPtr actor) { return process_data.at(actor); } @@ -105,7 +116,7 @@ MPI_Comm smpi_process_comm_self(){ } void smpi_process_init(int *argc, char ***argv){ - simgrid::smpi::Process::init(argc, argv); + simgrid::smpi::ActorExt::init(argc, argv); } int smpi_process_index(){ @@ -113,11 +124,11 @@ int smpi_process_index(){ } void * smpi_process_get_user_data(){ - return smpi_process()->get_user_data(); + return Actor::self()->get_impl()->get_user_data(); } void smpi_process_set_user_data(void *data){ - return smpi_process()->set_user_data(data); + Actor::self()->get_impl()->set_user_data(data); } @@ -266,13 +277,11 @@ void smpi_global_init() // This map holds for each computation unit (such as "default" or "process1" etc.) // the configuration as given by the user (counter data as a pair of (counter_name, counter_counter)) // and the (computed) event_set. - std::map units2papi_setup; if (not simgrid::config::get_value("smpi/papi-events").empty()) { if (PAPI_library_init(PAPI_VER_CURRENT) != PAPI_VER_CURRENT) XBT_ERROR("Could not initialize PAPI library; is it correctly installed and linked?" - " Expected version is %i", - PAPI_VER_CURRENT); + " Expected version is %u", PAPI_VER_CURRENT); typedef boost::tokenizer> Tokenizer; boost::char_separator separator_units(";"); @@ -349,6 +358,8 @@ 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(); } static void smpi_init_options(){ @@ -359,7 +370,7 @@ static void smpi_init_options(){ simgrid::smpi::Colls::smpi_coll_cleanup_callback = nullptr; smpi_cpu_threshold = simgrid::config::get_value("smpi/cpu-threshold"); smpi_host_speed = simgrid::config::get_value("smpi/host-speed"); - xbt_assert(smpi_host_speed >= 0, "You're trying to set the host_speed to a negative value (%f)", smpi_host_speed); + xbt_assert(smpi_host_speed > 0.0, "You're trying to set the host_speed to a non-positive value (given: %f)", smpi_host_speed); std::string smpi_privatize_option = simgrid::config::get_value("smpi/privatization"); if (smpi_privatize_option == "no" || smpi_privatize_option == "0") smpi_privatize_global_variables = SmpiPrivStrategies::NONE; @@ -376,9 +387,9 @@ static void smpi_init_options(){ XBT_DEBUG("Running without smpi_main(); disable smpi/privatization."); smpi_privatize_global_variables = SmpiPrivStrategies::NONE; } -#if defined(__FreeBSD__) +#if !HAVE_WORKING_MMAP if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) { - XBT_INFO("mmap privatization is broken on FreeBSD, switching to dlopen privatization instead."); + XBT_INFO("mmap privatization is broken on this platform, switching to dlopen privatization instead."); smpi_privatize_global_variables = SmpiPrivStrategies::DLOPEN; } #endif @@ -494,11 +505,9 @@ static int visit_libs(struct dl_phdr_info* info, size_t, void* data) static void smpi_init_privatization_dlopen(std::string executable) { - std::string executable_copy = executable; - // Prepare the copy of the binary (get its size) struct stat fdin_stat; - stat(executable_copy.c_str(), &fdin_stat); + stat(executable.c_str(), &fdin_stat); off_t fdin_size = fdin_stat.st_size; static std::size_t rank = 0; @@ -528,14 +537,14 @@ static void smpi_init_privatization_dlopen(std::string executable) } } - simix_global->default_function = [executable_copy, fdin_size](std::vector args) { - return std::function([executable_copy, fdin_size, args] { + simix_global->default_function = [executable, fdin_size](std::vector args) { + return std::function([executable, fdin_size, args] { // Copy the dynamic library: std::string target_executable = - executable_copy + "_" + std::to_string(getpid()) + "_" + std::to_string(rank) + ".so"; + executable + "_" + std::to_string(getpid()) + "_" + std::to_string(rank) + ".so"; - smpi_copy_file(executable_copy, target_executable, fdin_size); + 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; for (auto const& libpath : privatize_libs_paths) { @@ -587,17 +596,17 @@ static void smpi_init_privatization_dlopen(std::string executable) }; } -static void smpi_init_privatization_no_dlopen(const char* executable) +static void smpi_init_privatization_no_dlopen(std::string executable) { if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) smpi_prepare_global_memory_segment(); // Load the dynamic library and resolve the entry point: - void* handle = dlopen(executable, RTLD_LAZY | RTLD_LOCAL); + void* handle = dlopen(executable.c_str(), RTLD_LAZY | RTLD_LOCAL); if (handle == nullptr) - xbt_die("dlopen failed for %s: %s (errno: %d -- %s)", executable, dlerror(), errno, strerror(errno)); + xbt_die("dlopen failed for %s: %s (errno: %d -- %s)", executable.c_str(), dlerror(), errno, strerror(errno)); smpi_entry_point_type entry_point = smpi_resolve_function(handle); if (not entry_point) - xbt_die("main not found in %s", executable); + xbt_die("main not found in %s", executable.c_str()); if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) smpi_backup_global_memory_segment(); @@ -618,20 +627,18 @@ int smpi_main(const char* executable, int argc, char* argv[]) } TRACE_global_init(); - SIMIX_global_init(&argc, argv); - MSG_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::onCreation? + // 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 - SIMIX_create_environment(argv[1]); + simgrid::s4u::Engine::get_instance()->load_platform(argv[1]); SIMIX_comm_set_copy_data_callback(smpi_comm_copy_buffer_callback); smpi_init_options(); @@ -641,7 +648,7 @@ int smpi_main(const char* executable, int argc, char* argv[]) smpi_init_privatization_no_dlopen(executable); SMPI_init(); - SIMIX_launch_application(argv[2]); + simgrid::s4u::Engine::get_instance()->load_deployment(argv[2]); SMPI_app_instance_register(smpi_default_instance_name.c_str(), nullptr, process_data.size()); // This call has a side effect on process_count... MPI_COMM_WORLD = *smpi_deployment_comm_world(smpi_default_instance_name); @@ -680,7 +687,7 @@ int smpi_main(const char* executable, int argc, char* argv[]) 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::Process(actor, nullptr)}); + process_data.insert({actor, new simgrid::smpi::ActorExt(actor, nullptr)}); } }); simgrid::s4u::Actor::on_destruction.connect([](simgrid::s4u::ActorPtr actor) { @@ -702,6 +709,7 @@ void SMPI_finalize(){ } void smpi_mpi_init() { + smpi_init_fortran_types(); if(smpi_init_sleep > 0) simcall_process_sleep(smpi_init_sleep); }