factor surf_action_ in ActivityImpl

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

diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index ea4995d..0edc385 100644 (file)
--- a/src/kernel/activity/ExecImpl.cpp
+++ b/src/kernel/activity/ExecImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -17,7 +17,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
 
 simgrid::kernel::activity::ExecImpl::ExecImpl(std::string name, resource::Action* surf_action,
                                               resource::Action* timeout_detector, s4u::Host* host)
-    : ActivityImpl(name), host_(host), surf_action_(surf_action), timeout_detector_(timeout_detector)
+    : ActivityImpl(name, surf_action), host_(host), timeout_detector_(timeout_detector)
 {
   this->state_ = SIMIX_RUNNING;
 
@@ -42,6 +42,7 @@ void simgrid::kernel::activity::ExecImpl::suspend()
   XBT_VERB("This exec is suspended (remain: %f)", surf_action_->get_remains());
   if (surf_action_ != nullptr)
     surf_action_->suspend();
+  on_suspended(this);
 }
 
 void simgrid::kernel::activity::ExecImpl::resume()
@@ -49,6 +50,7 @@ void simgrid::kernel::activity::ExecImpl::resume()
   XBT_VERB("This exec is resumed (remain: %f)", surf_action_->get_remains());
   if (surf_action_ != nullptr)
     surf_action_->resume();
+  on_resumed(this);
 }
 void simgrid::kernel::activity::ExecImpl::cancel()
 {
@@ -153,5 +155,7 @@ simgrid::kernel::activity::ExecImpl::migrate(simgrid::s4u::Host* to)
  *************/
 simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr)> simgrid::kernel::activity::ExecImpl::on_creation;
 simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr)> simgrid::kernel::activity::ExecImpl::on_completion;
+simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr)> simgrid::kernel::activity::ExecImpl::on_resumed;
+simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr)> simgrid::kernel::activity::ExecImpl::on_suspended;
 simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr, simgrid::s4u::Host*)>
     simgrid::kernel::activity::ExecImpl::on_migration;