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
Merge ActivityImpl::post() and ::finish()
[simgrid.git]
/
src
/
kernel
/
actor
/
ActorImpl.cpp
diff --git
a/src/kernel/actor/ActorImpl.cpp
b/src/kernel/actor/ActorImpl.cpp
index
8b0ccf7
..
c2e2b48
100644
(file)
--- a/
src/kernel/actor/ActorImpl.cpp
+++ b/
src/kernel/actor/ActorImpl.cpp
@@
-8,6
+8,7
@@
#include <simgrid/s4u/Actor.hpp>
#include <simgrid/s4u/Host.hpp>
#include <simgrid/s4u/Actor.hpp>
#include <simgrid/s4u/Host.hpp>
+#include "src/internal_config.h"
#include "src/kernel/EngineImpl.hpp"
#if HAVE_SMPI
#include "src/smpi/include/private.hpp"
#include "src/kernel/EngineImpl.hpp"
#if HAVE_SMPI
#include "src/smpi/include/private.hpp"
@@
-126,12
+127,6
@@
void ActorImpl::cleanup_from_kernel()
if (not kernel_destroy_list_hook.is_linked())
engine->add_actor_to_destroy_list(*this);
if (not kernel_destroy_list_hook.is_linked())
engine->add_actor_to_destroy_list(*this);
- if (has_to_auto_restart() && not get_host()->is_on()) {
- XBT_DEBUG("Insert host %s to watched_hosts because it's off and %s needs to restart", get_host()->get_cname(),
- get_cname());
- watched_hosts().insert(get_host()->get_name());
- }
-
undaemonize();
s4u::Actor::on_termination(*get_ciface());
undaemonize();
s4u::Actor::on_termination(*get_ciface());
@@
-188,7
+183,7
@@
void ActorImpl::exit()
activity::ActivityImplPtr activity = waiting_synchro_;
activity->cancel();
activity->set_state(activity::State::FAILED);
activity::ActivityImplPtr activity = waiting_synchro_;
activity->cancel();
activity->set_state(activity::State::FAILED);
- activity->
post
();
+ activity->
finish
();
activities_.erase(waiting_synchro_);
waiting_synchro_ = nullptr;
activities_.erase(waiting_synchro_);
waiting_synchro_ = nullptr;
@@
-357,12
+352,12
@@
activity::ActivityImplPtr ActorImpl::join(const ActorImpl* actor, double timeout
{
activity::ActivityImplPtr sleep_activity = this->sleep(timeout);
if (actor->wannadie() || actor->to_be_freed()) {
{
activity::ActivityImplPtr sleep_activity = this->sleep(timeout);
if (actor->wannadie() || actor->to_be_freed()) {
- if (sleep_activity->
surf
_action_)
- sleep_activity->
surf
_action_->finish(resource::Action::State::FINISHED);
+ if (sleep_activity->
model
_action_)
+ sleep_activity->
model
_action_->finish(resource::Action::State::FINISHED);
} else {
actor->on_exit->emplace_back([sleep_activity](bool) {
} else {
actor->on_exit->emplace_back([sleep_activity](bool) {
- if (sleep_activity->
surf
_action_)
- sleep_activity->
surf
_action_->finish(resource::Action::State::FINISHED);
+ if (sleep_activity->
model
_action_)
+ sleep_activity->
model
_action_->finish(resource::Action::State::FINISHED);
});
}
return sleep_activity;
});
}
return sleep_activity;