fix some issues arising when killing new-born actors (see #260)

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

diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index d233924..e7b79f0 100644 (file)
--- a/src/kernel/activity/ExecImpl.cpp
+++ b/src/kernel/activity/ExecImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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. */
@@ -11,7 +11,6 @@
 #include "src/surf/surf_interface.hpp"
 #include "src/surf/cpu_interface.hpp"
 
-
 #include "simgrid/s4u/Host.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
@@ -32,16 +31,17 @@ simgrid::kernel::activity::ExecImpl::~ExecImpl()
     timeoutDetector->unref();
   XBT_DEBUG("Destroy exec %p", this);
 }
+
 void simgrid::kernel::activity::ExecImpl::suspend()
 {
-  XBT_VERB("This exec is suspended (remain: %f)", surfAction_->getRemains());
+  XBT_VERB("This exec is suspended (remain: %f)", surfAction_->get_remains());
   if (surfAction_)
     surfAction_->suspend();
 }
 
 void simgrid::kernel::activity::ExecImpl::resume()
 {
-  XBT_VERB("This exec is resumed (remain: %f)", surfAction_->getRemains());
+  XBT_VERB("This exec is resumed (remain: %f)", surfAction_->get_remains());
   if (surfAction_)
     surfAction_->resume();
 }
@@ -50,16 +50,23 @@ double simgrid::kernel::activity::ExecImpl::remains()
 {
   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 meant remainingRatio() instead?");
+                               "Did you mean remainingRatio() instead?");
 
-  return surfAction_ ? surfAction_->getRemains() : 0;
+  return surfAction_ ? surfAction_->get_remains() : 0;
 }
+
 double simgrid::kernel::activity::ExecImpl::remainingRatio()
 {
   if (host_ == nullptr) // parallel task: their remain is already between 0 and 1 (see comment in ExecImpl::remains())
-    return surfAction_->getRemains();
+    return surfAction_->get_remains();
   else // Actually compute the ratio for sequential tasks
-    return surfAction_->getRemains() / surfAction_->getCost();
+    return surfAction_->get_remains() / surfAction_->get_cost();
+}
+
+void simgrid::kernel::activity::ExecImpl::setBound(double bound)
+{
+  if (surfAction_)
+    surfAction_->set_bound(bound);
 }
 
 void simgrid::kernel::activity::ExecImpl::post()
@@ -68,10 +75,10 @@ void simgrid::kernel::activity::ExecImpl::post()
                                  /* If the host running the synchro failed, notice it. This way, the asking
                                   * process can be killed if it runs on that host itself */
     state = SIMIX_FAILED;
-  } else if (surfAction_->getState() == simgrid::surf::Action::State::failed) {
+  } else if (surfAction_ && surfAction_->get_state() == simgrid::kernel::resource::Action::State::failed) {
     /* If the host running the synchro didn't fail, then the synchro was canceled */
     state = SIMIX_CANCELED;
-  } else if (timeoutDetector && timeoutDetector->getState() == simgrid::surf::Action::State::done) {
+  } else if (timeoutDetector && timeoutDetector->get_state() == simgrid::kernel::resource::Action::State::done) {
     state = SIMIX_TIMEOUT;
   } else {
     state = SIMIX_DONE;
@@ -97,16 +104,16 @@ simgrid::kernel::activity::ExecImpl::migrate(simgrid::s4u::Host* to)
 {
 
   if (not MC_is_active() && not MC_record_replay_is_active()) {
-    surf_action_t oldAction = this->surfAction_;
-    surf_action_t newAction = to->pimpl_cpu->execution_start(oldAction->getCost());
-    newAction->setRemains(oldAction->getRemains());
-    newAction->setData(this);
-    newAction->setSharingWeight(oldAction->getPriority());
+    simgrid::kernel::resource::Action* oldAction = this->surfAction_;
+    simgrid::kernel::resource::Action* newAction = to->pimpl_cpu->execution_start(oldAction->get_cost());
+    newAction->set_remains(oldAction->get_remains());
+    newAction->set_data(this);
+    newAction->set_priority(oldAction->get_priority());
 
     // FIXME: the user-defined bound seem to not be kept by LMM, that seem to overwrite it for the multi-core modeling.
     // I hope that the user did not provide any.
 
-    oldAction->setData(nullptr);
+    oldAction->set_data(nullptr);
     oldAction->cancel();
     oldAction->unref();
     this->surfAction_ = newAction;
@@ -116,7 +123,6 @@ simgrid::kernel::activity::ExecImpl::migrate(simgrid::s4u::Host* to)
   return this;
 }
 
-
 /*************
  * Callbacks *
  *************/