X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/09dc22d76dcaa090778d6a9a5dfce073b1ba3ae4..120df14075aaab1a27d234cd170cff2b4f7df071:/src/smpi/internals/smpi_process.cpp diff --git a/src/smpi/internals/smpi_process.cpp b/src/smpi/internals/smpi_process.cpp index 36f01638bb..661968fc50 100644 --- a/src/smpi/internals/smpi_process.cpp +++ b/src/smpi/internals/smpi_process.cpp @@ -1,18 +1,19 @@ -/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2018. 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 "smpi_process.hpp" #include "mc/mc.h" -#include "private.hpp" -#include "simgrid/s4u/forward.hpp" #include "smpi_comm.hpp" -#include "smpi_group.hpp" #include "src/mc/mc_replay.hpp" #include "src/msg/msg_private.hpp" #include "src/simix/smx_private.hpp" -#include + +#if HAVE_PAPI +#include "papi.h" +extern std::string papi_default_config_name; +#endif XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_process, smpi, "Logging specific to SMPI (kernel)"); @@ -23,23 +24,18 @@ using simgrid::s4u::Actor; using simgrid::s4u::ActorPtr; Process::Process(ActorPtr actor, msg_bar_t finalization_barrier) - : finalization_barrier_(finalization_barrier), process_(actor) + : finalization_barrier_(finalization_barrier), actor_(actor) { - std::stringstream mailboxname; - std::stringstream mailboxname_small; - - mailboxname << std::string("SMPI-") << process_->getPid(); - mailboxname_small << std::string("small-") << process_->getPid(); - mailbox_ = simgrid::s4u::Mailbox::byName(mailboxname.str()); - mailbox_small_ = simgrid::s4u::Mailbox::byName(mailboxname_small.str()); - mailboxes_mutex_ = xbt_mutex_init(); - timer_ = xbt_os_timer_new(); - state_ = SMPI_UNINITIALIZED; + 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(); + timer_ = xbt_os_timer_new(); + state_ = SmpiProcessState::UNINITIALIZED; if (MC_is_active()) MC_ignore_heap(timer_, xbt_os_timer_size()); #if HAVE_PAPI - if (xbt_cfg_get_string("smpi/papi-events")[0] != '\0') { + if (not simgrid::config::get_value("smpi/papi-events").empty()) { // TODO: Implement host/process/thread based counters. This implementation // just always takes the values passed via "default", like this: // "default:COUNTER1:COUNTER2:COUNTER3;". @@ -47,10 +43,10 @@ Process::Process(ActorPtr actor, msg_bar_t finalization_barrier) if (it != units2papi_setup.end()) { papi_event_set_ = it->second.event_set; papi_counter_data_ = it->second.counter_data; - XBT_DEBUG("Setting PAPI set for process %i", i); + XBT_DEBUG("Setting PAPI set for process %li", actor->get_pid()); } else { papi_event_set_ = PAPI_NULL; - XBT_DEBUG("No PAPI set for process %i", i); + XBT_DEBUG("No PAPI set for process %li", actor->get_pid()); } } #endif @@ -58,6 +54,10 @@ Process::Process(ActorPtr actor, msg_bar_t finalization_barrier) Process::~Process() { + 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_); } @@ -65,13 +65,13 @@ Process::~Process() void Process::set_data(int* argc, char*** argv) { instance_id_ = std::string((*argv)[1]); - comm_world_ = smpi_deployment_comm_world(instance_id_.c_str()); - msg_bar_t barrier = smpi_deployment_finalization_barrier(instance_id_.c_str()); + comm_world_ = smpi_deployment_comm_world(instance_id_); + msg_bar_t barrier = smpi_deployment_finalization_barrier(instance_id_); if (barrier != nullptr) // don't overwrite the current one if the instance has none finalization_barrier_ = barrier; - process_ = simgrid::s4u::Actor::self(); - static_cast(process_->getImpl()->userdata)->data = this; + actor_ = simgrid::s4u::Actor::self(); + static_cast(actor_->get_impl()->get_user_data())->data = this; if (*argc > 3) { memmove(&(*argv)[0], &(*argv)[2], sizeof(char*) * (*argc - 2)); @@ -82,15 +82,15 @@ void Process::set_data(int* argc, char*** argv) argc_ = argc; argv_ = argv; // set the process attached to the mailbox - mailbox_small_->setReceiver(process_); - XBT_DEBUG("<%lu> New process in the game: %p", process_->getPid(), process_.get()); + 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. */ void Process::finalize() { - state_ = SMPI_FINALIZED; - XBT_DEBUG("<%lu> Process left the game", process_->getPid()); + 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()) @@ -102,7 +102,7 @@ void Process::finalize() /** @brief Check if a process is finalized */ int Process::finalized() { - return (state_ == SMPI_FINALIZED); + return (state_ == SmpiProcessState::FINALIZED); } /** @brief Check if a process is initialized */ @@ -110,18 +110,18 @@ int Process::initialized() { // TODO cheinrich: Check if we still need this. This should be a global condition, not for a // single process ... ? - return (state_ == SMPI_INITIALIZED); + return (state_ == SmpiProcessState::INITIALIZED); } /** @brief Mark a process as initialized (=MPI_Init called) */ void Process::mark_as_initialized() { - if (state_ != SMPI_FINALIZED) - state_ = SMPI_INITIALIZED; + if (state_ != SmpiProcessState::FINALIZED) + state_ = SmpiProcessState::INITIALIZED; } void Process::set_replaying(bool value){ - if (state_ != SMPI_FINALIZED) + if (state_ != SmpiProcessState::FINALIZED) replaying_ = value; } @@ -139,8 +139,9 @@ void *Process::get_user_data() return data_; } -ActorPtr Process::process(){ - return process_; +ActorPtr Process::get_actor() +{ + return actor_; } /** @@ -170,12 +171,12 @@ MPI_Comm Process::comm_world() smx_mailbox_t Process::mailbox() { - return mailbox_->getImpl(); + return mailbox_->get_impl(); } smx_mailbox_t Process::mailbox_small() { - return mailbox_small_->getImpl(); + return mailbox_small_->get_impl(); } xbt_mutex_t Process::mailboxes_mutex() @@ -189,7 +190,7 @@ int Process::papi_event_set() return papi_event_set_; } -papi_counter_t& smpi_process_papi_counters() +papi_counter_t& Process::papi_counters() { return papi_counter_data_; } @@ -215,7 +216,7 @@ MPI_Comm Process::comm_self() if(comm_self_==MPI_COMM_NULL){ MPI_Group group = new Group(1); comm_self_ = new Comm(group, nullptr); - group->set_mapping(process_, 0); + group->set_mapping(actor_, 0); } return comm_self_; } @@ -240,18 +241,6 @@ int Process::sampling() return sampling_; } -msg_bar_t Process::finalization_barrier(){ - return finalization_barrier_; -} - -int Process::return_value(){ - return return_value_; -} - -void Process::set_return_value(int val){ - return_value_=val; -} - void Process::init(int *argc, char ***argv){ if (smpi_process_count() == 0) { @@ -259,7 +248,7 @@ void Process::init(int *argc, char ***argv){ } if (argc != nullptr && argv != nullptr) { simgrid::s4u::ActorPtr proc = simgrid::s4u::Actor::self(); - proc->getImpl()->context->set_cleanup(&MSG_process_cleanup_from_SIMIX); + proc->get_impl()->context_->set_cleanup(&MSG_process_cleanup_from_SIMIX); char* instance_id = (*argv)[1]; try { @@ -272,19 +261,25 @@ void Process::init(int *argc, char ***argv){ // 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. Process* process = smpi_process_remote(proc); - int my_proc_id = proc->getPid(); - if(smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP){ + 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(my_proc_id); + SMPI_switch_data_segment(proc); } 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."); + 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."); +} + +int Process::get_optind(){ + return optind; +} +void Process::set_optind(int new_optind){ + optind=new_optind; } }