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
Update XBT_ATTRIB_DEPRECATED_v??? in comments.
[simgrid.git]
/
src
/
s4u
/
s4u_Activity.cpp
diff --git
a/src/s4u/s4u_Activity.cpp
b/src/s4u/s4u_Activity.cpp
index
65fd067
..
a1711b5
100644
(file)
--- a/
src/s4u/s4u_Activity.cpp
+++ b/
src/s4u/s4u_Activity.cpp
@@
-9,6
+9,7
@@
#include <simgrid/s4u/Engine.hpp>
#include <simgrid/s4u/Exec.hpp>
#include <simgrid/s4u/Io.hpp>
#include <simgrid/s4u/Engine.hpp>
#include <simgrid/s4u/Exec.hpp>
#include <simgrid/s4u/Io.hpp>
+#include <simgrid/s4u/Mess.hpp>
#include <xbt/log.h>
#include "src/kernel/activity/ActivityImpl.hpp"
#include <xbt/log.h>
#include "src/kernel/activity/ActivityImpl.hpp"
@@
-52,6
+53,8
@@
Activity* Activity::wait_for(double timeout)
if (state_ == State::FAILED) {
if (dynamic_cast<Comm*>(this))
throw NetworkFailureException(XBT_THROW_POINT, "Cannot wait for a failed comm");
if (state_ == State::FAILED) {
if (dynamic_cast<Comm*>(this))
throw NetworkFailureException(XBT_THROW_POINT, "Cannot wait for a failed comm");
+ if (dynamic_cast<Mess*>(this))
+ throw NetworkFailureException(XBT_THROW_POINT, "Cannot wait for a failed mess");
if (dynamic_cast<Exec*>(this))
throw HostFailureException(XBT_THROW_POINT, "Cannot wait for a failed exec");
if (dynamic_cast<Io*>(this))
if (dynamic_cast<Exec*>(this))
throw HostFailureException(XBT_THROW_POINT, "Cannot wait for a failed exec");
if (dynamic_cast<Io*>(this))
@@
-89,7
+92,7
@@
bool Activity::test()
return false;
}
return false;
}
-ssize_t Activity::test_any(const std::vector<ActivityPtr>& activities)
+ssize_t Activity::test_any(const std::vector<ActivityPtr>& activities)
// XBT_ATTRIB_DEPRECATED_v339
{
std::vector<kernel::activity::ActivityImpl*> ractivities(activities.size());
std::transform(begin(activities), end(activities), begin(ractivities),
{
std::vector<kernel::activity::ActivityImpl*> ractivities(activities.size());
std::transform(begin(activities), end(activities), begin(ractivities),
@@
-107,7
+110,7
@@
ssize_t Activity::test_any(const std::vector<ActivityPtr>& activities)
return changed_pos;
}
return changed_pos;
}
-ssize_t Activity::
wait_any_for(const std::vector<ActivityPtr>& activities, double timeout)
+ssize_t Activity::
deprecated_wait_any_for(const std::vector<ActivityPtr>& activities, double timeout) // XBT_ATTRIB_DEPRECATED_v339
{
std::vector<kernel::activity::ActivityImpl*> ractivities(activities.size());
std::transform(begin(activities), end(activities), begin(ractivities),
{
std::vector<kernel::activity::ActivityImpl*> ractivities(activities.size());
std::transform(begin(activities), end(activities), begin(ractivities),