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 757667b..2065487 100644 (file)
--- a/src/kernel/activity/ActivityImpl.cpp
+++ b/src/kernel/activity/ActivityImpl.cpp
@@ -20,13 +20,18 @@ ActivityImpl::~ActivityImpl()
   }
 }
 
+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);
+  on_suspended(*this);
 }
 
 void ActivityImpl::resume()
@@ -35,13 +40,7 @@ void ActivityImpl::resume()
     return;
   XBT_VERB("This activity is resumed (remain: %f)", surf_action_->get_remains());
   surf_action_->resume();
-  on_resumed(this);
-}
-
-void ActivityImpl::set_category(const std::string& category)
-{
-  if (surf_action_)
-    surf_action_->set_category(category);
+  on_resumed(*this);
 }
 
 // boost::intrusive_ptr<Activity> support:
@@ -57,8 +56,8 @@ void intrusive_ptr_release(simgrid::kernel::activity::ActivityImpl* activity)
     delete activity;
   }
 }
-xbt::signal<void(ActivityImplPtr)> ActivityImpl::on_resumed;
-xbt::signal<void(ActivityImplPtr)> ActivityImpl::on_suspended;
+xbt::signal<void(ActivityImpl const&)> ActivityImpl::on_resumed;
+xbt::signal<void(ActivityImpl const&)> ActivityImpl::on_suspended;
 }
 }
 } // namespace simgrid::kernel::activity::