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
Separate ConditionVariableImpl into its own files
[simgrid.git]
/
src
/
kernel
/
activity
/
CommImpl.cpp
diff --git
a/src/kernel/activity/CommImpl.cpp
b/src/kernel/activity/CommImpl.cpp
index 954704f7efb80b55b20f3e03ea667f3af158756a..129aeafc5efe2c27aec695776dfecb65cad941d1 100644
(file)
--- a/
src/kernel/activity/CommImpl.cpp
+++ b/
src/kernel/activity/CommImpl.cpp
@@
-72,7
+72,7
@@
void simgrid::kernel::activity::CommImpl::cancel()
/** @brief get the amount remaining from the communication */
double simgrid::kernel::activity::CommImpl::remains()
{
/** @brief get the amount remaining from the communication */
double simgrid::kernel::activity::CommImpl::remains()
{
- return surfAction_->get
R
emains();
+ return surfAction_->get
_r
emains();
}
/** @brief This is part of the cleanup process, probably an internal command */
}
/** @brief This is part of the cleanup process, probably an internal command */
@@
-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
S
tate() == simgrid::kernel::resource::Action::State::done)
+ if (src_timeout && src_timeout->get
_s
tate() == simgrid::kernel::resource::Action::State::done)
state = SIMIX_SRC_TIMEOUT;
state = SIMIX_SRC_TIMEOUT;
- else if (dst_timeout && dst_timeout->get
S
tate() == simgrid::kernel::resource::Action::State::done)
+ else if (dst_timeout && dst_timeout->get
_s
tate() == simgrid::kernel::resource::Action::State::done)
state = SIMIX_DST_TIMEOUT;
state = SIMIX_DST_TIMEOUT;
- else if (src_timeout && src_timeout->get
S
tate() == simgrid::kernel::resource::Action::State::failed)
+ else if (src_timeout && src_timeout->get
_s
tate() == simgrid::kernel::resource::Action::State::failed)
state = SIMIX_SRC_HOST_FAILURE;
state = SIMIX_SRC_HOST_FAILURE;
- else if (dst_timeout && dst_timeout->get
S
tate() == simgrid::kernel::resource::Action::State::failed)
+ else if (dst_timeout && dst_timeout->get
_s
tate() == simgrid::kernel::resource::Action::State::failed)
state = SIMIX_DST_HOST_FAILURE;
state = SIMIX_DST_HOST_FAILURE;
- else if (surfAction_ && surfAction_->get
S
tate() == simgrid::kernel::resource::Action::State::failed) {
+ else if (surfAction_ && surfAction_->get
_s
tate() == simgrid::kernel::resource::Action::State::failed) {
state = SIMIX_LINK_FAILURE;
} else
state = SIMIX_DONE;
state = SIMIX_LINK_FAILURE;
} else
state = SIMIX_DONE;