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
a81face
..
015ca20
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)) {
@@
-176,10
+180,6
@@
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();
get_iface()->fire_on_this_suspend();
XBT_VERB("This activity is suspended (remain: %f)", model_action_->get_remains());
get_iface()->fire_on_suspend();
get_iface()->fire_on_this_suspend();