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
simplify the actor finalization a tiny bit by using a callback
[simgrid.git]
/
src
/
kernel
/
activity
/
CommImpl.cpp
diff --git
a/src/kernel/activity/CommImpl.cpp
b/src/kernel/activity/CommImpl.cpp
index
7d9bd69
..
516c8fc
100644
(file)
--- a/
src/kernel/activity/CommImpl.cpp
+++ b/
src/kernel/activity/CommImpl.cpp
@@
-5,8
+5,8
@@
#include "src/kernel/activity/CommImpl.hpp"
#include "simgrid/kernel/resource/Action.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "simgrid/kernel/resource/Action.hpp"
-
#include "simgrid/modelchecker.h"
#include "simgrid/modelchecker.h"
+#include "src/kernel/activity/MailboxImpl.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/simix/smx_network_private.hpp"
#include "src/surf/surf_interface.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/simix/smx_network_private.hpp"
#include "src/surf/surf_interface.hpp"
@@
-97,15
+97,15
@@
void simgrid::kernel::activity::CommImpl::cleanupSurf()
void simgrid::kernel::activity::CommImpl::post()
{
/* Update synchro state */
void simgrid::kernel::activity::CommImpl::post()
{
/* Update synchro state */
- if (src_timeout && src_timeout->get_state() == simgrid::kernel::resource::Action::State::
done
)
+ if (src_timeout && src_timeout->get_state() == simgrid::kernel::resource::Action::State::
FINISHED
)
state_ = SIMIX_SRC_TIMEOUT;
state_ = SIMIX_SRC_TIMEOUT;
- else if (dst_timeout && dst_timeout->get_state() == simgrid::kernel::resource::Action::State::
done
)
+ else if (dst_timeout && dst_timeout->get_state() == simgrid::kernel::resource::Action::State::
FINISHED
)
state_ = SIMIX_DST_TIMEOUT;
state_ = SIMIX_DST_TIMEOUT;
- else if (src_timeout && src_timeout->get_state() == simgrid::kernel::resource::Action::State::
failed
)
+ else if (src_timeout && src_timeout->get_state() == simgrid::kernel::resource::Action::State::
FAILED
)
state_ = SIMIX_SRC_HOST_FAILURE;
state_ = SIMIX_SRC_HOST_FAILURE;
- else if (dst_timeout && dst_timeout->get_state() == simgrid::kernel::resource::Action::State::
failed
)
+ else if (dst_timeout && dst_timeout->get_state() == simgrid::kernel::resource::Action::State::
FAILED
)
state_ = SIMIX_DST_HOST_FAILURE;
state_ = SIMIX_DST_HOST_FAILURE;
- else if (surfAction_ && surfAction_->get_state() == simgrid::kernel::resource::Action::State::
failed
) {
+ else if (surfAction_ && surfAction_->get_state() == simgrid::kernel::resource::Action::State::
FAILED
) {
state_ = SIMIX_LINK_FAILURE;
} else
state_ = SIMIX_DONE;
state_ = SIMIX_LINK_FAILURE;
} else
state_ = SIMIX_DONE;