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
factor simcall/activity binding
[simgrid.git]
/
src
/
kernel
/
activity
/
ActivityImpl.cpp
diff --git
a/src/kernel/activity/ActivityImpl.cpp
b/src/kernel/activity/ActivityImpl.cpp
index
d50f13c
..
c5f3524
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);
@@
-12,14
+13,30
@@
namespace kernel {
namespace activity {
ActivityImpl::~ActivityImpl()
namespace activity {
ActivityImpl::~ActivityImpl()
+{
+ clean_action();
+ 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_) {
surf_action_->unref();
{
if (surf_action_) {
surf_action_->unref();
- XBT_DEBUG("Destroy activity %p", this);
surf_action_ = nullptr;
}
}
surf_action_ = nullptr;
}
}
+double ActivityImpl::get_remaining() const
+{
+ return surf_action_ ? surf_action_->get_remains() : 0;
+}
+
void ActivityImpl::suspend()
{
if (surf_action_ == nullptr)
void ActivityImpl::suspend()
{
if (surf_action_ == nullptr)
@@
-38,6
+55,14
@@
void ActivityImpl::resume()
on_resumed(*this);
}
on_resumed(*this);
}
+void ActivityImpl::cancel()
+{
+ XBT_VERB("Activity %p is canceled", this);
+ if (surf_action_ != nullptr)
+ surf_action_->cancel();
+ state_ = SIMIX_CANCELED;
+}
+
// boost::intrusive_ptr<Activity> support:
void intrusive_ptr_add_ref(simgrid::kernel::activity::ActivityImpl* activity)
{
// boost::intrusive_ptr<Activity> support:
void intrusive_ptr_add_ref(simgrid::kernel::activity::ActivityImpl* activity)
{