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
90ddcf7
..
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"
@@
-24,11
+25,6
@@
template class xbt::Extendable<s4u::Activity>;
namespace s4u {
namespace s4u {
-xbt::signal<void(Activity&)> Activity::on_veto;
-xbt::signal<void(Activity const&)> Activity::on_completion;
-xbt::signal<void(Activity const&)> Activity::on_suspend;
-xbt::signal<void(Activity const&)> Activity::on_resume;
-
std::set<Activity*>* Activity::vetoed_activities_ = nullptr;
void Activity::destroy()
std::set<Activity*>* Activity::vetoed_activities_ = nullptr;
void Activity::destroy()
@@
-57,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))
@@
-65,7
+63,7
@@
Activity* Activity::wait_for(double timeout)
}
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
}
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
- kernel::actor::ActivityWaitSimcall observer{issuer, pimpl_.get(), timeout};
+ kernel::actor::ActivityWaitSimcall observer{issuer, pimpl_.get(), timeout
, "wait_for"
};
if (kernel::actor::simcall_blocking(
[&observer] { observer.get_activity()->wait_for(observer.get_issuer(), observer.get_timeout()); }, &observer))
throw TimeoutException(XBT_THROW_POINT, "Timeouted");
if (kernel::actor::simcall_blocking(
[&observer] { observer.get_activity()->wait_for(observer.get_issuer(), observer.get_timeout()); }, &observer))
throw TimeoutException(XBT_THROW_POINT, "Timeouted");
@@
-85,7
+83,7
@@
bool Activity::test()
this->start();
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
this->start();
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
- kernel::actor::ActivityTestSimcall observer{issuer, pimpl_.get()};
+ kernel::actor::ActivityTestSimcall observer{issuer, pimpl_.get()
, "test"
};
if (kernel::actor::simcall_answered([&observer] { return observer.get_activity()->test(observer.get_issuer()); },
&observer)) {
complete(State::FINISHED);
if (kernel::actor::simcall_answered([&observer] { return observer.get_activity()->test(observer.get_issuer()); },
&observer)) {
complete(State::FINISHED);
@@
-94,14
+92,14
@@
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),
[](const ActivityPtr& act) { return act->pimpl_.get(); });
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
{
std::vector<kernel::activity::ActivityImpl*> ractivities(activities.size());
std::transform(begin(activities), end(activities), begin(ractivities),
[](const ActivityPtr& act) { return act->pimpl_.get(); });
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
- kernel::actor::ActivityTestanySimcall observer{issuer, ractivities};
+ kernel::actor::ActivityTestanySimcall observer{issuer, ractivities
, "test_any"
};
ssize_t changed_pos = kernel::actor::simcall_answered(
[&observer] {
return kernel::activity::ActivityImpl::test_any(observer.get_issuer(), observer.get_activities());
ssize_t changed_pos = kernel::actor::simcall_answered(
[&observer] {
return kernel::activity::ActivityImpl::test_any(observer.get_issuer(), observer.get_activities());
@@
-112,14
+110,14
@@
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),
[](const ActivityPtr& activity) { return activity->pimpl_.get(); });
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
{
std::vector<kernel::activity::ActivityImpl*> ractivities(activities.size());
std::transform(begin(activities), end(activities), begin(ractivities),
[](const ActivityPtr& activity) { return activity->pimpl_.get(); });
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
- kernel::actor::ActivityWaitanySimcall observer{issuer, ractivities, timeout};
+ kernel::actor::ActivityWaitanySimcall observer{issuer, ractivities, timeout
, "wait_any_for"
};
ssize_t changed_pos = kernel::actor::simcall_blocking(
[&observer] {
kernel::activity::ActivityImpl::wait_any_for(observer.get_issuer(), observer.get_activities(),
ssize_t changed_pos = kernel::actor::simcall_blocking(
[&observer] {
kernel::activity::ActivityImpl::wait_any_for(observer.get_issuer(), observer.get_activities(),