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 waitfor of Io too
[simgrid.git]
/
src
/
kernel
/
activity
/
ActivityImpl.cpp
diff --git
a/src/kernel/activity/ActivityImpl.cpp
b/src/kernel/activity/ActivityImpl.cpp
index
da8f12d
..
2406311
100644
(file)
--- a/
src/kernel/activity/ActivityImpl.cpp
+++ b/
src/kernel/activity/ActivityImpl.cpp
@@
-4,6
+4,7
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/kernel/activity/ActivityImpl.hpp"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/kernel/activity/ActivityImpl.hpp"
+#include "src/simix/smx_private.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
@@
-17,6
+18,12
@@
ActivityImpl::~ActivityImpl()
XBT_DEBUG("Destroy activity %p", this);
}
XBT_DEBUG("Destroy activity %p", this);
}
+void ActivityImpl::register_simcall(smx_simcall_t simcall)
+{
+ simcalls_.push_back(simcall);
+ simcall->issuer_->waiting_synchro = this;
+}
+
void ActivityImpl::clean_action()
{
if (surf_action_) {
void ActivityImpl::clean_action()
{
if (surf_action_) {
@@
-53,6
+60,7
@@
void ActivityImpl::cancel()
XBT_VERB("Activity %p is canceled", this);
if (surf_action_ != nullptr)
surf_action_->cancel();
XBT_VERB("Activity %p is canceled", this);
if (surf_action_ != nullptr)
surf_action_->cancel();
+ state_ = State::CANCELED;
}
// boost::intrusive_ptr<Activity> support:
}
// boost::intrusive_ptr<Activity> support: