A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mpi_comm_self was cleaned after mpi finalization during actor deletion, which was...
[simgrid.git]
/
src
/
smpi
/
internals
/
smpi_actor.cpp
diff --git
a/src/smpi/internals/smpi_actor.cpp
b/src/smpi/internals/smpi_actor.cpp
index
e960acc
..
d97e4e1
100644
(file)
--- a/
src/smpi/internals/smpi_actor.cpp
+++ b/
src/smpi/internals/smpi_actor.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-20
21
. 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. */
/* 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. */
@@
-12,7
+12,6
@@
#if HAVE_PAPI
#include "papi.h"
#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)");
#endif
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_process, smpi, "Logging specific to SMPI (kernel)");
@@
-36,11
+35,11
@@
ActorExt::ActorExt(s4u::Actor* actor) : actor_(actor)
MC_ignore_heap(timer_, xbt_os_timer_size());
#if HAVE_PAPI
MC_ignore_heap(timer_, xbt_os_timer_size());
#if HAVE_PAPI
- if (not s
imgrid::config::get_value<std::string>("smpi/papi-events"
).empty()) {
+ if (not s
mpi_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;".
// 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;
if (it != units2papi_setup.end()) {
papi_event_set_ = it->second.event_set;
papi_counter_data_ = it->second.counter_data;
@@
-55,12
+54,6
@@
ActorExt::ActorExt(s4u::Actor* actor) : actor_(actor)
ActorExt::~ActorExt()
{
ActorExt::~ActorExt()
{
- TRACE_smpi_finalize(actor_->get_pid());
-
- 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_os_timer_free(timer_);
}
@@
-69,24
+62,29
@@
void ActorExt::finalize()
{
state_ = SmpiProcessState::FINALIZED;
XBT_DEBUG("<%ld> Process left the game", actor_->get_pid());
{
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_);
}
/** @brief Check if a process is finalized */
smpi_deployment_unregister_process(instance_id_);
}
/** @brief Check if a process is finalized */
-int ActorExt::finalized()
+int ActorExt::finalized()
const
{
return (state_ == SmpiProcessState::FINALIZED);
}
/** @brief Check if a process is partially initialized already */
{
return (state_ == SmpiProcessState::FINALIZED);
}
/** @brief Check if a process is partially initialized already */
-int ActorExt::initializing()
+int ActorExt::initializing()
const
{
return (state_ == SmpiProcessState::INITIALIZING);
}
/** @brief Check if a process is initialized */
{
return (state_ == SmpiProcessState::INITIALIZING);
}
/** @brief Check if a process is initialized */
-int ActorExt::initialized()
+int ActorExt::initialized()
const
{
// TODO cheinrich: Check if we still need this. This should be a global condition, not for a
// single process ... ?
{
// TODO cheinrich: Check if we still need this. This should be a global condition, not for a
// single process ... ?
@@
-106,7
+104,7
@@
void ActorExt::set_replaying(bool value)
replaying_ = value;
}
replaying_ = value;
}
-bool ActorExt::replaying()
+bool ActorExt::replaying()
const
{
return replaying_;
}
{
return replaying_;
}
@@
-131,23
+129,23
@@
void ActorExt::set_privatized_region(smpi_privatization_region_t region)
privatized_region_ = region;
}
privatized_region_ = region;
}
-smpi_privatization_region_t ActorExt::privatized_region()
+smpi_privatization_region_t ActorExt::privatized_region()
const
{
return privatized_region_;
}
{
return privatized_region_;
}
-MPI_Comm ActorExt::comm_world()
+MPI_Comm ActorExt::comm_world()
const
{
return comm_world_ == nullptr ? MPI_COMM_NULL : *comm_world_;
}
{
return comm_world_ == nullptr ? MPI_COMM_NULL : *comm_world_;
}
-s4u::MutexPtr ActorExt::mailboxes_mutex()
+s4u::MutexPtr ActorExt::mailboxes_mutex()
const
{
return mailboxes_mutex_;
}
#if HAVE_PAPI
{
return mailboxes_mutex_;
}
#if HAVE_PAPI
-int ActorExt::papi_event_set()
+int ActorExt::papi_event_set()
const
{
return papi_event_set_;
}
{
return papi_event_set_;
}
@@
-168,7
+166,7
@@
void ActorExt::simulated_start()
simulated_ = SIMIX_get_clock();
}
simulated_ = SIMIX_get_clock();
}
-double ActorExt::simulated_elapsed()
+double ActorExt::simulated_elapsed()
const
{
return SIMIX_get_clock() - simulated_;
}
{
return SIMIX_get_clock() - simulated_;
}
@@
-176,8
+174,8
@@
double ActorExt::simulated_elapsed()
MPI_Comm ActorExt::comm_self()
{
if (comm_self_ == MPI_COMM_NULL) {
MPI_Comm ActorExt::comm_self()
{
if (comm_self_ == MPI_COMM_NULL) {
-
MPI_Group
group = new Group(1);
- comm_self_
= new Comm(group, nullptr);
+
auto*
group = new Group(1);
+ comm_self_ = new Comm(group, nullptr);
group->set_mapping(actor_, 0);
}
return comm_self_;
group->set_mapping(actor_, 0);
}
return comm_self_;
@@
-205,7
+203,7
@@
void ActorExt::set_sampling(int s)
sampling_ = s;
}
sampling_ = s;
}
-int ActorExt::sampling()
+int ActorExt::sampling()
const
{
return sampling_;
}
{
return sampling_;
}
@@
-215,7
+213,7
@@
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.");
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
Ptr
self = simgrid::s4u::Actor::self();
+ 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();
// 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();
@@
-223,7
+221,7
@@
void ActorExt::init()
if (ext->initialized())
return;
if (ext->initialized())
return;
- if (smpi_
privatize_global_variables
== SmpiPrivStrategies::MMAP) {
+ 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 */
/* Now using the segment index of this process */
ext->set_privatized_region(smpi_init_global_memory_segment_process());
/* Done at the process's creation */
@@
-243,7
+241,7
@@
void ActorExt::init()
XBT_DEBUG("<%ld> SMPI process has been initialized: %p", ext->actor_->get_pid(), ext->actor_);
}
XBT_DEBUG("<%ld> SMPI process has been initialized: %p", ext->actor_->get_pid(), ext->actor_);
}
-int ActorExt::get_optind()
+int ActorExt::get_optind()
const
{
return optind_;
}
{
return optind_;
}