factor get_remaining across acitvities

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

diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp
index a92efa2..2065487 100644 (file)
--- a/src/kernel/activity/ActivityImpl.cpp
+++ b/src/kernel/activity/ActivityImpl.cpp
@@ -5,14 +5,42 @@
 
 #include "src/kernel/activity/ActivityImpl.hpp"
 
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
+
 namespace simgrid {
 namespace kernel {
 namespace activity {
 
-void simgrid::kernel::activity::ActivityImpl::set_category(std::string category)
+ActivityImpl::~ActivityImpl()
+{
+  if (surf_action_) {
+    surf_action_->unref();
+    XBT_DEBUG("Destroy activity %p", this);
+    surf_action_ = nullptr;
+  }
+}
+
+double ActivityImpl::get_remaining() const
+{
+  return surf_action_ ? surf_action_->get_remains() : 0;
+}
+
+void ActivityImpl::suspend()
+{
+  if (surf_action_ == nullptr)
+    return;
+  XBT_VERB("This activity is suspended (remain: %f)", surf_action_->get_remains());
+  surf_action_->suspend();
+  on_suspended(*this);
+}
+
+void ActivityImpl::resume()
 {
-  if (surf_action_)
-    surf_action_->set_category(category);
+  if (surf_action_ == nullptr)
+    return;
+  XBT_VERB("This activity is resumed (remain: %f)", surf_action_->get_remains());
+  surf_action_->resume();
+  on_resumed(*this);
 }
 
 // boost::intrusive_ptr<Activity> support:
@@ -28,6 +56,8 @@ void intrusive_ptr_release(simgrid::kernel::activity::ActivityImpl* activity)
     delete activity;
   }
 }
+xbt::signal<void(ActivityImpl const&)> ActivityImpl::on_resumed;
+xbt::signal<void(ActivityImpl const&)> ActivityImpl::on_suspended;
 }
 }
 } // namespace simgrid::kernel::activity::