modernize a few simcall_execution_* calls

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

diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index dc7dad5..8e5fd99 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. */
@@ -15,15 +15,15 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
 
-simgrid::kernel::activity::ExecImpl::ExecImpl(std::string name, resource::Action* surf_action,
+simgrid::kernel::activity::ExecImpl::ExecImpl(std::string name, std::string tracing_category,
                                               resource::Action* timeout_detector, s4u::Host* host)
-    : ActivityImpl(name), host_(host), surf_action_(surf_action), timeout_detector_(timeout_detector)
+    : ActivityImpl(name), host_(host), timeout_detector_(timeout_detector)
 {
   this->state_ = SIMIX_RUNNING;
+  this->set_category(tracing_category);
 
-  surf_action_->set_data(this);
   if (timeout_detector != nullptr)
-    timeout_detector->set_data(this);
+    timeout_detector_->set_data(this);
 
   XBT_DEBUG("Create exec %p", this);
 }
@@ -37,11 +37,26 @@ simgrid::kernel::activity::ExecImpl::~ExecImpl()
   XBT_DEBUG("Destroy exec %p", this);
 }
 
+void simgrid::kernel::activity::ExecImpl::start(double flops_amount, double priority, double bound)
+{
+  if (not MC_is_active() && not MC_record_replay_is_active()) {
+    surf_action_ = host_->pimpl_cpu->execution_start(flops_amount);
+    surf_action_->set_data(this);
+    surf_action_->set_priority(priority);
+    if (bound > 0)
+      surf_action_->set_bound(bound);
+  }
+
+  XBT_DEBUG("Create execute synchro %p: %s", this, name_.c_str());
+  simgrid::kernel::activity::ExecImpl::on_creation(this);
+}
+
 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 +64,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()
 {
@@ -62,7 +78,6 @@ double simgrid::kernel::activity::ExecImpl::get_remaining()
   xbt_assert(host_ != nullptr, "Calling remains() on a parallel execution is not allowed. "
                                "We would need to return a vector instead of a scalar. "
                                "Did you mean remainingRatio() instead?");
-
   return surf_action_ ? surf_action_->get_remains() : 0;
 }
 
@@ -86,6 +101,12 @@ void simgrid::kernel::activity::ExecImpl::set_priority(double priority)
     surf_action_->set_priority(priority);
 }
 
+void simgrid::kernel::activity::ExecImpl::set_category(std::string category)
+{
+  if (surf_action_)
+    surf_action_->set_category(category);
+}
+
 void simgrid::kernel::activity::ExecImpl::post()
 {
   if (host_ && host_->is_off()) { /* FIXME: handle resource failure for parallel tasks too */
@@ -147,5 +168,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;