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
add specifying handling of timeout for MessImpl (none for now). Fix a bug on incomple...
[simgrid.git]
/
src
/
kernel
/
activity
/
ActivityImpl.cpp
diff --git
a/src/kernel/activity/ActivityImpl.cpp
b/src/kernel/activity/ActivityImpl.cpp
index
39f6d47
..
015ca20
100644
(file)
--- a/
src/kernel/activity/ActivityImpl.cpp
+++ b/
src/kernel/activity/ActivityImpl.cpp
@@
-63,7
+63,7
@@
const char* ActivityImpl::get_state_str() const
bool ActivityImpl::test(actor::ActorImpl* issuer)
{
if (state_ != State::WAITING && state_ != State::RUNNING) {
bool ActivityImpl::test(actor::ActorImpl* issuer)
{
if (state_ != State::WAITING && state_ != State::RUNNING) {
-
post
();
+
finish
();
issuer->exception_ = nullptr; // Do not propagate exception in that case
return true;
}
issuer->exception_ = nullptr; // Do not propagate exception in that case
return true;
}
@@
-106,8
+106,12
@@
void ActivityImpl::wait_for(actor::ActorImpl* issuer, double timeout)
/* If the synchro is already finished then perform the error handling */
if (state_ != State::WAITING && state_ != State::RUNNING) {
/* If the synchro is already finished then perform the error handling */
if (state_ != State::WAITING && state_ != State::RUNNING) {
-
post
();
+
finish
();
} else {
} 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)) {
@@
-145,7
+149,7
@@
void ActivityImpl::wait_any_for(actor::ActorImpl* issuer, const std::vector<Acti
act->simcalls_.push_back(&issuer->simcall_);
observer->set_result(idx);
act->set_state(State::DONE);
act->simcalls_.push_back(&issuer->simcall_);
observer->set_result(idx);
act->set_state(State::DONE);
- act->
post
();
+ act->
finish
();
}
return;
}
}
return;
}
@@
-167,7
+171,7
@@
void ActivityImpl::wait_any_for(actor::ActorImpl* issuer, const std::vector<Acti
act->simcalls_.push_back(&issuer->simcall_);
/* see if the synchro is already finished */
if (act->get_state() != State::WAITING && act->get_state() != State::RUNNING) {
act->simcalls_.push_back(&issuer->simcall_);
/* see if the synchro is already finished */
if (act->get_state() != State::WAITING && act->get_state() != State::RUNNING) {
- act->
post
();
+ act->
finish
();
break;
}
}
break;
}
}
@@
-176,11
+180,10
@@
void ActivityImpl::wait_any_for(actor::ActorImpl* issuer, const std::vector<Acti
void ActivityImpl::suspend()
{
void ActivityImpl::suspend()
{
- if (model_action_ == nullptr)
- return;
XBT_VERB("This activity is suspended (remain: %f)", model_action_->get_remains());
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();
- s4u::Activity::on_suspended(*get_iface());
}
void ActivityImpl::resume()
}
void ActivityImpl::resume()
@@
-188,8
+191,9
@@
void ActivityImpl::resume()
if (model_action_ == nullptr)
return;
XBT_VERB("This activity is resumed (remain: %f)", model_action_->get_remains());
if (model_action_ == nullptr)
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();
- s4u::Activity::on_resumed(*get_iface());
}
void ActivityImpl::cancel()
}
void ActivityImpl::cancel()