X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f..HEAD:/src/smpi/internals/smpi_actor.cpp diff --git a/src/smpi/internals/smpi_actor.cpp b/src/smpi/internals/smpi_actor.cpp index 1c332e8643..056cecf48e 100644 --- a/src/smpi/internals/smpi_actor.cpp +++ b/src/smpi/internals/smpi_actor.cpp @@ -1,24 +1,24 @@ -/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2023. 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. */ #include "src/smpi/include/smpi_actor.hpp" -#include "mc/mc.h" +#include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Mutex.hpp" #include "smpi_comm.hpp" #include "smpi_info.hpp" +#include "src/mc/mc.h" #include "src/mc/mc_replay.hpp" -#include "src/simix/smx_private.hpp" +#include "xbt/str.h" #if HAVE_PAPI -#include "papi.h" -extern std::string papi_default_config_name; +#include #endif XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_process, smpi, "Logging specific to SMPI (kernel)"); -namespace simgrid { -namespace smpi { +namespace simgrid::smpi { simgrid::xbt::Extension ActorExt::EXTENSION_ID; ActorExt::ActorExt(s4u::Actor* actor) : actor_(actor) @@ -26,21 +26,19 @@ ActorExt::ActorExt(s4u::Actor* actor) : actor_(actor) if (not simgrid::smpi::ActorExt::EXTENSION_ID.valid()) simgrid::smpi::ActorExt::EXTENSION_ID = simgrid::s4u::Actor::extension_create(); - mailbox_ = s4u::Mailbox::by_name("SMPI-" + std::to_string(actor_->get_pid())); - mailbox_small_ = s4u::Mailbox::by_name("small-" + std::to_string(actor_->get_pid())); + mailbox_ = nullptr; + mailbox_small_ = nullptr; mailboxes_mutex_ = s4u::Mutex::create(); timer_ = xbt_os_timer_new(); state_ = SmpiProcessState::UNINITIALIZED; info_env_ = MPI_INFO_NULL; - if (MC_is_active()) - MC_ignore_heap(timer_, xbt_os_timer_size()); #if HAVE_PAPI if (not smpi_cfg_papi_events_file().empty()) { // TODO: Implement host/process/thread based counters. This implementation // just always takes the values passed via "default", like this: // "default:COUNTER1:COUNTER2:COUNTER3;". - auto it = units2papi_setup.find(papi_default_config_name); + auto it = units2papi_setup.find("default"); if (it != units2papi_setup.end()) { papi_event_set_ = it->second.event_set; papi_counter_data_ = it->second.counter_data; @@ -55,12 +53,6 @@ ActorExt::ActorExt(s4u::Actor* actor) : actor_(actor) ActorExt::~ActorExt() { - if (info_env_ != MPI_INFO_NULL) - simgrid::smpi::Info::unref(info_env_); - if (comm_self_ != MPI_COMM_NULL) - simgrid::smpi::Comm::destroy(comm_self_); - if (comm_intra_ != MPI_COMM_NULL) - simgrid::smpi::Comm::destroy(comm_intra_); xbt_os_timer_free(timer_); } @@ -69,7 +61,12 @@ void ActorExt::finalize() { state_ = SmpiProcessState::FINALIZED; XBT_DEBUG("<%ld> Process left the game", actor_->get_pid()); - + if (info_env_ != MPI_INFO_NULL) + simgrid::smpi::Info::unref(info_env_); + if (comm_self_ != MPI_COMM_NULL) + simgrid::smpi::Comm::destroy(comm_self_); + if (comm_intra_ != MPI_COMM_NULL) + simgrid::smpi::Comm::destroy(comm_intra_); smpi_deployment_unregister_process(instance_id_); } @@ -93,6 +90,22 @@ int ActorExt::initialized() const return (state_ == SmpiProcessState::INITIALIZED); } +/** @brief Return main mailbox of the process */ +s4u::Mailbox* ActorExt::mailbox() +{ + if(mailbox_==nullptr) + mailbox_=s4u::Mailbox::by_name("SMPI-" + std::to_string(actor_->get_pid())); + return mailbox_; +} + +/** @brief Return mailbox for small messages */ +s4u::Mailbox* ActorExt::mailbox_small() +{ + if(mailbox_small_==nullptr) + mailbox_small_=s4u::Mailbox::by_name("small-" + std::to_string(actor_->get_pid())); + return mailbox_small_; +} + /** @brief Mark a process as initialized (=MPI_Init called) */ void ActorExt::mark_as_initialized() { @@ -100,6 +113,19 @@ void ActorExt::mark_as_initialized() state_ = SmpiProcessState::INITIALIZED; } +/** @brief Mark a process as finalizing (=MPI_Finalize called) */ +void ActorExt::mark_as_finalizing() +{ + if (state_ != SmpiProcessState::FINALIZED) + state_ = SmpiProcessState::FINALIZING; +} + +/** @brief Check if a process is finalizing */ +int ActorExt::finalizing() const +{ + return (state_ == SmpiProcessState::FINALIZING); +} + void ActorExt::set_replaying(bool value) { if (state_ != SmpiProcessState::FINALIZED) @@ -165,12 +191,12 @@ xbt_os_timer_t ActorExt::timer() void ActorExt::simulated_start() { - simulated_ = SIMIX_get_clock(); + simulated_ = s4u::Engine::get_clock(); } double ActorExt::simulated_elapsed() const { - return SIMIX_get_clock() - simulated_; + return s4u::Engine::get_clock() - simulated_; } MPI_Comm ActorExt::comm_self() @@ -178,7 +204,8 @@ MPI_Comm ActorExt::comm_self() if (comm_self_ == MPI_COMM_NULL) { auto* group = new Group(1); comm_self_ = new Comm(group, nullptr); - group->set_mapping(actor_, 0); + comm_self_->set_name("MPI_COMM_SELF"); + group->set_mapping(actor_->get_pid(), 0); } return comm_self_; } @@ -212,26 +239,17 @@ int ActorExt::sampling() const void ActorExt::init() { - xbt_assert(smpi_get_universe_size() != 0, "SimGrid was not initialized properly before entering MPI_Init. " - "Aborting, please check compilation process and use smpirun."); - - simgrid::s4u::Actor* self = simgrid::s4u::Actor::self(); - // cheinrich: I'm not sure what the impact of the SMPI_switch_data_segment on this call is. I moved - // this up here so that I can set the privatized region before the switch. ActorExt* ext = smpi_process(); // if we are in MPI_Init and argc handling has already been done. if (ext->initialized()) return; - if (smpi_cfg_privatization() == SmpiPrivStrategies::MMAP) { - /* Now using the segment index of this process */ - ext->set_privatized_region(smpi_init_global_memory_segment_process()); - /* Done at the process's creation */ - SMPI_switch_data_segment(self); - } - - ext->instance_id_ = self->get_property("instance_id"); - const int rank = xbt_str_parse_int(self->get_property("rank"), "Cannot parse rank"); + const simgrid::s4u::Actor* self = simgrid::s4u::Actor::self(); + const char* id = self->get_property("instance_id"); + xbt_assert(id != nullptr, "Actor '%s' seem to be calling MPI_Init(), but it was created outside of MPI, wasn't it?", + self->get_cname()); + ext->instance_id_ = id; + const int rank = static_cast(xbt_str_parse_int(self->get_property("rank"), "Cannot parse rank")); ext->state_ = SmpiProcessState::INITIALIZING; smpi_deployment_register_process(ext->instance_id_, rank, self); @@ -239,7 +257,7 @@ void ActorExt::init() ext->comm_world_ = smpi_deployment_comm_world(ext->instance_id_); // set the process attached to the mailbox - ext->mailbox_small_->set_receiver(ext->actor_); + ext->mailbox_small()->set_receiver(ext->actor_); XBT_DEBUG("<%ld> SMPI process has been initialized: %p", ext->actor_->get_pid(), ext->actor_); } @@ -259,11 +277,13 @@ void ActorExt::bsend_buffer(void** buf, int* size) *size = bsend_buffer_size_; } -void ActorExt::set_bsend_buffer(void* buf, int size) +int ActorExt::set_bsend_buffer(void* buf, int size) { + if(buf!=nullptr && bsend_buffer_!=nullptr) + return MPI_ERR_BUFFER; bsend_buffer_ = buf; bsend_buffer_size_= size; + return MPI_SUCCESS; } -} // namespace smpi -} // namespace simgrid +} // namespace simgrid::smpi