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
Properly register the waiter in wait_any_for(), so that it gets handled on suspend...
[simgrid.git]
/
src
/
kernel
/
activity
/
ActivityImpl.cpp
diff --git
a/src/kernel/activity/ActivityImpl.cpp
b/src/kernel/activity/ActivityImpl.cpp
index
d1bafa9
..
f1a9859
100644
(file)
--- a/
src/kernel/activity/ActivityImpl.cpp
+++ b/
src/kernel/activity/ActivityImpl.cpp
@@
-108,6
+108,10
@@
void ActivityImpl::wait_for(actor::ActorImpl* issuer, double timeout)
if (state_ != State::WAITING && state_ != State::RUNNING) {
finish();
} else {
if (state_ != State::WAITING && state_ != State::RUNNING) {
finish();
} else {
+ /* As Messages in Message Queues are virtually instantaneous, we do not need a timeout */
+ /* Or maybe we do, and will have to implement a specific way to handle them is need arises */
+ if (dynamic_cast<MessImpl*>(this) != nullptr)
+ return;
/* we need a sleep action (even when the timeout is infinite) to be notified of host failures */
/* Comms handle that a bit differently of the other activities */
if (auto* comm = dynamic_cast<CommImpl*>(this)) {
/* we need a sleep action (even when the timeout is infinite) to be notified of host failures */
/* Comms handle that a bit differently of the other activities */
if (auto* comm = dynamic_cast<CommImpl*>(this)) {
@@
-142,7
+146,7
@@
void ActivityImpl::wait_any_for(actor::ActorImpl* issuer, const std::vector<Acti
xbt_assert(timeout <= 0.0, "Timeout not implemented for waitany in the model-checker");
if (int idx = observer->get_value(); idx != -1) {
auto* act = activities.at(idx);
xbt_assert(timeout <= 0.0, "Timeout not implemented for waitany in the model-checker");
if (int idx = observer->get_value(); idx != -1) {
auto* act = activities.at(idx);
- act->
simcalls_.push_back
(&issuer->simcall_);
+ act->
register_simcall
(&issuer->simcall_);
observer->set_result(idx);
act->set_state(State::DONE);
act->finish();
observer->set_result(idx);
act->set_state(State::DONE);
act->finish();
@@
-164,7
+168,7
@@
void ActivityImpl::wait_any_for(actor::ActorImpl* issuer, const std::vector<Acti
for (auto* act : activities) {
/* associate this simcall to the the synchro */
for (auto* act : activities) {
/* associate this simcall to the the synchro */
- act->
simcalls_.push_back
(&issuer->simcall_);
+ act->
register_simcall
(&issuer->simcall_);
/* see if the synchro is already finished */
if (act->get_state() != State::WAITING && act->get_state() != State::RUNNING) {
act->finish();
/* see if the synchro is already finished */
if (act->get_state() != State::WAITING && act->get_state() != State::RUNNING) {
act->finish();
@@
-176,12
+180,9
@@
void ActivityImpl::wait_any_for(actor::ActorImpl* issuer, const std::vector<Acti
void ActivityImpl::suspend()
{
void ActivityImpl::suspend()
{
- if (model_action_ == nullptr) {
- XBT_CRITICAL("POUET");
- return;
- }
XBT_VERB("This activity is suspended (remain: %f)", model_action_->get_remains());
get_iface()->fire_on_suspend();
XBT_VERB("This activity is suspended (remain: %f)", model_action_->get_remains());
get_iface()->fire_on_suspend();
+ get_iface()->fire_on_this_suspend();
model_action_->suspend();
}
model_action_->suspend();
}
@@
-191,6
+192,7
@@
void ActivityImpl::resume()
return;
XBT_VERB("This activity is resumed (remain: %f)", model_action_->get_remains());
get_iface()->fire_on_resume();
return;
XBT_VERB("This activity is resumed (remain: %f)", model_action_->get_remains());
get_iface()->fire_on_resume();
+ get_iface()->fire_on_this_resume();
model_action_->resume();
}
model_action_->resume();
}