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
Keep execution alive after timeout in sg_exec_wait_for.
[simgrid.git]
/
src
/
s4u
/
s4u_Actor.cpp
diff --git
a/src/s4u/s4u_Actor.cpp
b/src/s4u/s4u_Actor.cpp
index ba18f7715c46251842782d993263469a0e57be9f..0528b7116ca50542e984e80ac628d288dfd44b94 100644
(file)
--- a/
src/s4u/s4u_Actor.cpp
+++ b/
src/s4u/s4u_Actor.cpp
@@
-114,7
+114,7
@@
void Actor::join(double timeout) const
{
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
const kernel::actor::ActorImpl* target = pimpl_;
- kernel::actor::simcall_blocking
<void>
([issuer, target, timeout] {
+ kernel::actor::simcall_blocking([issuer, target, timeout] {
if (target->finished_) {
// The joined process is already finished, just wake up the issuer right away
issuer->simcall_answer();
@@
-133,7
+133,7
@@
void Actor::set_auto_restart(bool autorestart)
auto* arg = new kernel::actor::ProcessArg(pimpl_->get_host(), pimpl_);
XBT_DEBUG("Adding %s to the actors_at_boot_ list of Host %s", arg->name.c_str(), arg->host->get_cname());
- pimpl_->get_host()->
pimpl_
->add_actor_at_boot(arg);
+ pimpl_->get_host()->
get_impl()
->add_actor_at_boot(arg);
});
}
@@
-157,13
+157,10
@@
void Actor::set_host(Host* new_host)
const s4u::Host* previous_location = get_host();
kernel::actor::simcall([this, new_host]() {
- if (pimpl_->waiting_synchro_ != nullptr) {
- // The actor is blocked on an activity. If it's an exec, migrate it too.
+ for (auto& activity : pimpl_->activities_) {
// FIXME: implement the migration of other kinds of activities
- kernel::activity::ExecImplPtr exec =
- boost::dynamic_pointer_cast<kernel::activity::ExecImpl>(pimpl_->waiting_synchro_);
- xbt_assert(exec.get() != nullptr, "We can only migrate blocked actors when they are blocked on executions.");
- exec->migrate(new_host);
+ if (auto exec = boost::dynamic_pointer_cast<kernel::activity::ExecImpl>(activity))
+ exec->migrate(new_host);
}
this->pimpl_->set_host(new_host);
});
@@
-221,7
+218,7
@@
void Actor::suspend()
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
kernel::actor::ActorImpl* target = pimpl_;
s4u::Actor::on_suspend(*this);
- kernel::actor::simcall_blocking
<void>
([issuer, target]() {
+ kernel::actor::simcall_blocking([issuer, target]() {
target->suspend();
if (target != issuer) {
/* If we are suspending ourselves, then just do not finish the simcall now */
@@
-322,7
+319,7
@@
void sleep_for(double duration)
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
Actor::on_sleep(*issuer->get_ciface());
- kernel::actor::simcall_blocking
<void>
([issuer, duration]() {
+ kernel::actor::simcall_blocking([issuer, duration]() {
if (MC_is_active() || MC_record_replay_is_active()) {
MC_process_clock_add(issuer, duration);
issuer->simcall_answer();
@@
-437,7
+434,7
@@
void suspend()
{
kernel::actor::ActorImpl* self = simgrid::kernel::actor::ActorImpl::self();
s4u::Actor::on_suspend(*self->get_ciface());
- kernel::actor::simcall_blocking
<void>
([self] { self->suspend(); });
+ kernel::actor::simcall_blocking([self] { self->suspend(); });
}
void exit()
@@
-492,7
+489,7
@@
sg_actor_t sg_actor_init(const char* name, sg_host_t host)
return simgrid::s4u::Actor::init(name, host).get();
}
-void sg_actor_start
(sg_actor_t actor, xbt_main_func_t code, int argc,
char* const* argv)
+void sg_actor_start
_(sg_actor_t actor, xbt_main_func_t code, int argc, const
char* const* argv)
{
simgrid::kernel::actor::ActorCode function;
if (code)
@@
-500,7
+497,7
@@
void sg_actor_start(sg_actor_t actor, xbt_main_func_t code, int argc, char* cons
actor->start(function);
}
-sg_actor_t sg_actor_create
(const char* name, sg_host_t host, xbt_main_func_t code, int argc,
char* const* argv)
+sg_actor_t sg_actor_create
_(const char* name, sg_host_t host, xbt_main_func_t code, int argc, const
char* const* argv)
{
simgrid::kernel::actor::ActorCode function = simgrid::xbt::wrap_main(code, argc, argv);
return simgrid::s4u::Actor::init(name, host)->start(function).get();
@@
-745,7
+742,8
@@
sg_actor_t sg_actor_attach(const char* name, void* data, sg_host_t host, xbt_dic
/* Let's create the process: SIMIX may decide to start it right now, even before returning the flow control to us */
smx_actor_t actor = nullptr;
try {
- actor = simgrid::kernel::actor::ActorImpl::attach(name, data, host, &props).get();
+ actor = simgrid::kernel::actor::ActorImpl::attach(name, data, host).get();
+ actor->set_properties(props);
} catch (simgrid::HostFailureException const&) {
xbt_die("Could not attach");
}