X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d51848cefcf39dbe0072eacd5fc50765b8b4e37..33925fdb0f910412956d1bcf3e91987b1d3a6cf7:/src/smpi/internals/smpi_actor.cpp diff --git a/src/smpi/internals/smpi_actor.cpp b/src/smpi/internals/smpi_actor.cpp index 2b88022816..0bc5edcc8b 100644 --- a/src/smpi/internals/smpi_actor.cpp +++ b/src/smpi/internals/smpi_actor.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2019. 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. */ @@ -6,8 +6,8 @@ #include "src/smpi/include/smpi_actor.hpp" #include "mc/mc.h" #include "smpi_comm.hpp" +#include "smpi_info.hpp" #include "src/mc/mc_replay.hpp" -#include "src/msg/msg_private.hpp" #include "src/simix/smx_private.hpp" #if HAVE_PAPI @@ -19,23 +19,24 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_process, smpi, "Logging specific to SMPI (k namespace simgrid { namespace smpi { +simgrid::xbt::Extension ActorExt::EXTENSION_ID; -using simgrid::s4u::Actor; -using simgrid::s4u::ActorPtr; - -ActorExt::ActorExt(ActorPtr actor, simgrid::s4u::Barrier* finalization_barrier) - : finalization_barrier_(finalization_barrier), actor_(actor) +ActorExt::ActorExt(s4u::Actor* actor) : actor_(actor) { - mailbox_ = simgrid::s4u::Mailbox::by_name("SMPI-" + std::to_string(actor_->get_pid())); - mailbox_small_ = simgrid::s4u::Mailbox::by_name("small-" + std::to_string(actor_->get_pid())); - mailboxes_mutex_ = xbt_mutex_init(); + 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())); + 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 simgrid::config::get_value("smpi/papi-events").empty()) { + 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;". @@ -54,35 +55,13 @@ ActorExt::ActorExt(ActorPtr actor, simgrid::s4u::Barrier* finalization_barrier) 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_); - xbt_mutex_destroy(mailboxes_mutex_); -} - -void ActorExt::set_data(int* argc, char*** argv) -{ - instance_id_ = std::string((*argv)[1]); - comm_world_ = smpi_deployment_comm_world(instance_id_); - simgrid::s4u::Barrier* barrier = smpi_deployment_finalization_barrier(instance_id_); - if (barrier != nullptr) // don't overwrite the current one if the instance has none - finalization_barrier_ = barrier; - - static_cast(actor_->get_impl()->get_user_data())->data = this; - - if (*argc > 3) { - memmove(&(*argv)[0], &(*argv)[2], sizeof(char*) * (*argc - 2)); - (*argv)[(*argc) - 1] = nullptr; - (*argv)[(*argc) - 2] = nullptr; - } - (*argc) -= 2; - argc_ = argc; - argv_ = argv; - // set the process attached to the mailbox - mailbox_small_->set_receiver(actor_); - XBT_DEBUG("<%ld> SMPI process has been initialized: %p", actor_->get_pid(), actor_.get()); } /** @brief Prepares the current process for termination. */ @@ -91,11 +70,7 @@ void ActorExt::finalize() state_ = SmpiProcessState::FINALIZED; XBT_DEBUG("<%ld> Process left the game", actor_->get_pid()); - // This leads to an explosion of the search graph which cannot be reduced: - if (MC_is_active() || MC_record_replay_is_active()) - return; - // wait for all pending asynchronous comms to finish - finalization_barrier_->wait(); + smpi_deployment_unregister_process(instance_id_); } /** @brief Check if a process is finalized */ @@ -104,6 +79,12 @@ int ActorExt::finalized() return (state_ == SmpiProcessState::FINALIZED); } +/** @brief Check if a process is partially initialized already */ +int ActorExt::initializing() +{ + return (state_ == SmpiProcessState::INITIALIZING); +} + /** @brief Check if a process is initialized */ int ActorExt::initialized() { @@ -130,25 +111,15 @@ bool ActorExt::replaying() return replaying_; } -void ActorExt::set_user_data(void* data) -{ - data_ = data; -} - -void* ActorExt::get_user_data() -{ - return data_; -} - -ActorPtr ActorExt::get_actor() +s4u::ActorPtr ActorExt::get_actor() { return actor_; } /** - * \brief Returns a structure that stores the location (filename + linenumber) of the last calls to MPI_* functions. + * @brief Returns a structure that stores the location (filename + linenumber) of the last calls to MPI_* functions. * - * \see smpi_trace_set_call_location + * @see smpi_trace_set_call_location */ smpi_trace_call_location_t* ActorExt::call_location() { @@ -170,17 +141,7 @@ MPI_Comm ActorExt::comm_world() return comm_world_ == nullptr ? MPI_COMM_NULL : *comm_world_; } -smx_mailbox_t ActorExt::mailbox() -{ - return mailbox_->get_impl(); -} - -smx_mailbox_t ActorExt::mailbox_small() -{ - return mailbox_small_->get_impl(); -} - -xbt_mutex_t ActorExt::mailboxes_mutex() +s4u::MutexPtr ActorExt::mailboxes_mutex() { return mailboxes_mutex_; } @@ -222,6 +183,13 @@ MPI_Comm ActorExt::comm_self() return comm_self_; } +MPI_Info ActorExt::info_env() +{ + if (info_env_==MPI_INFO_NULL) + info_env_=new Info(); + return info_env_; +} + MPI_Comm ActorExt::comm_intra() { return comm_intra_; @@ -242,49 +210,59 @@ int ActorExt::sampling() return sampling_; } -void ActorExt::init(int* argc, char*** argv) +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."); - if (smpi_process_count() == 0) { - xbt_die("SimGrid was not initialized properly before entering MPI_Init. Aborting, please check compilation process " - "and use smpirun\n"); + 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); } - if (argc != nullptr && argv != nullptr) { - simgrid::s4u::ActorPtr proc = simgrid::s4u::Actor::self(); - proc->get_impl()->context_->set_cleanup(&MSG_process_cleanup_from_SIMIX); - - char* instance_id = (*argv)[1]; - try { - int rank = std::stoi(std::string((*argv)[2])); - smpi_deployment_register_process(instance_id, rank, proc); - } catch (std::invalid_argument& ia) { - throw std::invalid_argument(std::string("Invalid rank: ") + (*argv)[2]); - } - // 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* process = smpi_process_remote(proc); - if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) { - /* Now using the segment index of this process */ - process->set_privatized_region(smpi_init_global_memory_segment_process()); - /* Done at the process's creation */ - SMPI_switch_data_segment(proc); - } + ext->instance_id_ = self->get_property("instance_id"); + const int rank = xbt_str_parse_int(self->get_property("rank"), "Cannot parse rank"); - process->set_data(argc, argv); - } - xbt_assert(smpi_process(), "smpi_process() returned nullptr. You probably gave a nullptr parameter to MPI_Init. " - "Although it's required by MPI-2, this is currently not supported by SMPI. " - "Please use MPI_Init(&argc, &argv) as usual instead."); + ext->state_ = SmpiProcessState::INITIALIZING; + smpi_deployment_register_process(ext->instance_id_, rank, self); + + ext->comm_world_ = smpi_deployment_comm_world(ext->instance_id_); + + // set the process attached to the mailbox + ext->mailbox_small_->set_receiver(ext->actor_); + XBT_DEBUG("<%ld> SMPI process has been initialized: %p", ext->actor_->get_pid(), ext->actor_); } int ActorExt::get_optind() { - return optind; + return optind_; } + void ActorExt::set_optind(int new_optind) { - optind = new_optind; + optind_ = new_optind; +} + +void ActorExt::bsend_buffer(void** buf, int* size) +{ + *buf = bsend_buffer_; + *size = bsend_buffer_size_; +} + +void ActorExt::set_bsend_buffer(void* buf, int size) +{ + bsend_buffer_ = buf; + bsend_buffer_size_= size; } } // namespace smpi