X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a937fbd0e884f8e83c4fefce16f8989328369ac9..33d0a5072b2c5d0a0d12740ba41434a5876ce997:/src/smpi/internals/smpi_global.cpp diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 8f4367ce50..6638b9cf75 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,8 +21,9 @@ #include #include #include +#include -#if not defined(__APPLE__) +#if not defined(__APPLE__) && not defined(__HAIKU__) #include #endif @@ -31,7 +33,7 @@ # define MAC_OS_X_VERSION_10_12 101200 # endif constexpr bool HAVE_WORKING_MMAP = (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12); -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__sun) || defined(__HAIKU__) constexpr bool HAVE_WORKING_MMAP = false; #else constexpr bool HAVE_WORKING_MMAP = true; @@ -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; @@ -112,42 +112,38 @@ 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)) @@ -172,14 +168,12 @@ static void check_blocks(std::vector> &private_blocks, void smpi_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size) { - 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); } @@ -187,7 +181,7 @@ void smpi_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, v 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))) { + 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); } @@ -218,7 +212,7 @@ void smpi_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, v 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); @@ -245,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, @@ -368,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(); } @@ -423,7 +418,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 @@ -475,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; }; @@ -510,7 +505,7 @@ static void smpi_copy_file(const std::string& src, const std::string& target, of #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()); @@ -527,11 +522,12 @@ static void smpi_copy_file(const std::string& src, const std::string& target, of } } } + 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); @@ -564,7 +560,7 @@ static void smpi_init_privatization_dlopen(const std::string& executable) // get library name from path char fullpath[512] = {'\0'}; strncpy(fullpath, libname.c_str(), 511); -#if not defined(__APPLE__) +#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); @@ -671,7 +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; - + 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); @@ -720,13 +716,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);