make more sense

[simgrid.git] / src / kernel / activity / ActivityImpl.cpp

diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp
index d50f13c..5454050 100644 (file)
--- a/src/kernel/activity/ActivityImpl.cpp
+++ b/src/kernel/activity/ActivityImpl.cpp
@@ -12,14 +12,24 @@ namespace kernel {
 namespace activity {
 
 ActivityImpl::~ActivityImpl()
 namespace activity {
 
 ActivityImpl::~ActivityImpl()

+{
+  clean_action();
+  XBT_DEBUG("Destroy activity %p", 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 +48,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)
 {