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
[sonar] Put parentheses around macro parameters.
[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
bafd01b
..
eae4244
100644
(file)
--- a/
src/smpi/internals/smpi_actor.cpp
+++ b/
src/smpi/internals/smpi_actor.cpp
@@
-21,7
+21,7
@@
namespace simgrid {
namespace smpi {
simgrid::xbt::Extension<simgrid::s4u::Actor, ActorExt> ActorExt::EXTENSION_ID;
namespace smpi {
simgrid::xbt::Extension<simgrid::s4u::Actor, ActorExt> ActorExt::EXTENSION_ID;
-ActorExt::ActorExt(s4u::Actor
Ptr
actor) : actor_(actor)
+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<simgrid::smpi::ActorExt>();
{
if (not simgrid::smpi::ActorExt::EXTENSION_ID.valid())
simgrid::smpi::ActorExt::EXTENSION_ID = simgrid::s4u::Actor::extension_create<simgrid::smpi::ActorExt>();
@@
-55,8
+55,6
@@
ActorExt::ActorExt(s4u::ActorPtr 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)
if (comm_self_ != MPI_COMM_NULL)
simgrid::smpi::Comm::destroy(comm_self_);
if (comm_intra_ != MPI_COMM_NULL)
@@
-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();
@@
-240,7
+238,7
@@
void ActorExt::init()
// set the process attached to the mailbox
ext->mailbox_small_->set_receiver(ext->actor_);
// 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_
.get()
);
+ XBT_DEBUG("<%ld> SMPI process has been initialized: %p", ext->actor_->get_pid(), ext->actor_);
}
int ActorExt::get_optind()
}
int ActorExt::get_optind()
@@
-253,5
+251,17
@@
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
} // namespace simgrid
} // namespace smpi
} // namespace simgrid