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
SMPI init: stringify and rename a variable
[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
1e43e29
..
3b91956
100644
(file)
--- a/
src/smpi/internals/smpi_actor.cpp
+++ b/
src/smpi/internals/smpi_actor.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-201
9
. 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. */
@@
-19,17
+19,15
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_process, smpi, "Logging specific to SMPI (k
namespace simgrid {
namespace smpi {
namespace simgrid {
namespace smpi {
-using simgrid::s4u::Actor;
-using simgrid::s4u::ActorPtr;
-
-ActorExt::ActorExt(ActorPtr actor, simgrid::s4u::Barrier* finalization_barrier)
+ActorExt::ActorExt(s4u::ActorPtr actor, s4u::Barrier* finalization_barrier)
: finalization_barrier_(finalization_barrier), actor_(actor)
{
: finalization_barrier_(finalization_barrier), actor_(actor)
{
- mailbox_ = s
imgrid::s
4u::Mailbox::by_name("SMPI-" + std::to_string(actor_->get_pid()));
- mailbox_small_ = s
imgrid::s
4u::Mailbox::by_name("small-" + std::to_string(actor_->get_pid()));
- mailboxes_mutex_ =
xbt_mutex_init
();
+ 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;
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 (MC_is_active())
MC_ignore_heap(timer_, xbt_os_timer_size());
@@
-58,12
+56,11
@@
ActorExt::~ActorExt()
if (comm_intra_ != MPI_COMM_NULL)
simgrid::smpi::Comm::destroy(comm_intra_);
xbt_os_timer_free(timer_);
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(const
char*
instance_id)
+void ActorExt::set_data(const
std::string&
instance_id)
{
{
- instance_id_ =
std::string(instance_id)
;
+ instance_id_ =
instance_id
;
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
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
@@
-125,7
+122,7
@@
bool ActorExt::replaying()
return replaying_;
}
return replaying_;
}
-ActorPtr ActorExt::get_actor()
+
s4u::
ActorPtr ActorExt::get_actor()
{
return actor_;
}
{
return actor_;
}
@@
-155,17
+152,7
@@
MPI_Comm ActorExt::comm_world()
return comm_world_ == nullptr ? MPI_COMM_NULL : *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_;
}
{
return mailboxes_mutex_;
}
@@
-207,6
+194,11
@@
MPI_Comm ActorExt::comm_self()
return comm_self_;
}
return comm_self_;
}
+MPI_Info ActorExt::info_env()
+{
+ return info_env_;
+}
+
MPI_Comm ActorExt::comm_intra()
{
return comm_intra_;
MPI_Comm ActorExt::comm_intra()
{
return comm_intra_;
@@
-229,43
+221,41
@@
int ActorExt::sampling()
void ActorExt::init()
{
void ActorExt::init()
{
- 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");
- }
+ 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::ActorPtr proc = simgrid::s4u::Actor::self();
- proc->get_impl()->context_->set_cleanup(&SIMIX_process_cleanup);
+ simgrid::s4u::ActorPtr 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.
// 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
);
+ ActorExt*
ext = smpi_process_remote(self
);
// if we are in MPI_Init and argc handling has already been done.
// if we are in MPI_Init and argc handling has already been done.
- if (
process
->initialized())
+ if (
ext
->initialized())
return;
if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) {
/* Now using the segment index of this process */
return;
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());
+
ext
->set_privatized_region(smpi_init_global_memory_segment_process());
/* Done at the process's creation */
/* Done at the process's creation */
- SMPI_switch_data_segment(
proc
);
+ SMPI_switch_data_segment(
self
);
}
}
-
const char* instance_id = simgrid::s4u::Actor::self()
->get_property("instance_id");
- const int rank = xbt_str_parse_int(s
imgrid::s4u::Actor::self()
->get_property("rank"), "Cannot parse rank");
+
std::string instance_id = self
->get_property("instance_id");
+ const int rank = xbt_str_parse_int(s
elf
->get_property("rank"), "Cannot parse rank");
-
process
->state_ = SmpiProcessState::INITIALIZING;
- smpi_deployment_register_process(instance_id, rank,
proc
);
+
ext
->state_ = SmpiProcessState::INITIALIZING;
+ smpi_deployment_register_process(instance_id, rank,
self
);
-
process
->set_data(instance_id);
+
ext
->set_data(instance_id);
}
int ActorExt::get_optind()
{
}
int ActorExt::get_optind()
{
- return optind;
+ return optind
_
;
}
}
+
void ActorExt::set_optind(int new_optind)
{
void ActorExt::set_optind(int new_optind)
{
- optind = new_optind;
+ optind
_
= new_optind;
}
} // namespace smpi
}
} // namespace smpi