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
Update copyright lines for 2022.
[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
c6f7164
..
5122d0e
100644
(file)
--- a/
src/smpi/internals/smpi_actor.cpp
+++ b/
src/smpi/internals/smpi_actor.cpp
@@
-1,18
+1,18
@@
-/* Copyright (c) 2009-202
0
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-202
2
. 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 "src/smpi/include/smpi_actor.hpp"
#include "mc/mc.h"
/* 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 "src/smpi/include/smpi_actor.hpp"
#include "mc/mc.h"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Mutex.hpp"
#include "smpi_comm.hpp"
#include "smpi_info.hpp"
#include "src/mc/mc_replay.hpp"
#include "smpi_comm.hpp"
#include "smpi_info.hpp"
#include "src/mc/mc_replay.hpp"
-#include "src/simix/smx_private.hpp"
#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)");
@@
-40,7
+40,7
@@
ActorExt::ActorExt(s4u::Actor* actor) : actor_(actor)
// 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
+55,6
@@
ActorExt::ActorExt(s4u::Actor* actor) : actor_(actor)
ActorExt::~ActorExt()
{
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_os_timer_free(timer_);
}
@@
-69,7
+63,12
@@
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_);
}
smpi_deployment_unregister_process(instance_id_);
}
@@
-165,20
+164,21
@@
xbt_os_timer_t ActorExt::timer()
void ActorExt::simulated_start()
{
void ActorExt::simulated_start()
{
- simulated_ =
SIMIX_
get_clock();
+ simulated_ =
s4u::Engine::
get_clock();
}
double ActorExt::simulated_elapsed() const
{
}
double ActorExt::simulated_elapsed() const
{
- return
SIMIX_
get_clock() - simulated_;
+ return
s4u::Engine::
get_clock() - simulated_;
}
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);
- group->set_mapping(actor_, 0);
+ auto* group = new Group(1);
+ comm_self_ = new Comm(group, nullptr);
+ comm_self_->set_name("MPI_COMM_SELF");
+ group->set_mapping(actor_->get_pid(), 0);
}
return comm_self_;
}
}
return comm_self_;
}
@@
-215,21
+215,12
@@
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* 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;
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);
- }
-
+ const simgrid::s4u::Actor* self = simgrid::s4u::Actor::self();
ext->instance_id_ = self->get_property("instance_id");
const int rank = xbt_str_parse_int(self->get_property("rank"), "Cannot parse rank");
ext->instance_id_ = self->get_property("instance_id");
const int rank = xbt_str_parse_int(self->get_property("rank"), "Cannot parse rank");
@@
-259,10
+250,13
@@
void ActorExt::bsend_buffer(void** buf, int* size)
*size = bsend_buffer_size_;
}
*size = bsend_buffer_size_;
}
-
void
ActorExt::set_bsend_buffer(void* buf, int size)
+
int
ActorExt::set_bsend_buffer(void* buf, int size)
{
{
+ if(buf!=nullptr && bsend_buffer_!=nullptr)
+ return MPI_ERR_BUFFER;
bsend_buffer_ = buf;
bsend_buffer_size_= size;
bsend_buffer_ = buf;
bsend_buffer_size_= size;
+ return MPI_SUCCESS;
}
} // namespace smpi
}
} // namespace smpi