X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/64437bba76e1819b14838c489e69749153efa6f3..acd052f4e734a5580577a6462a6e08c0ea3b5509:/src/kernel/activity/ExecImpl.cpp

diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index e394bdd431..097947c319 100644
--- a/src/kernel/activity/ExecImpl.cpp
+++ b/src/kernel/activity/ExecImpl.cpp
@@ -3,11 +3,15 @@
 /* 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. */
 
-#include "simgrid/s4u/Host.hpp"
+#include "simgrid/modelchecker.h"
+#include "src/mc/mc_replay.hpp"
 
 #include "src/kernel/activity/ExecImpl.hpp"
 #include "src/simix/smx_host_private.hpp"
 #include "src/surf/surf_interface.hpp"
+#include "src/surf/cpu_interface.hpp"
+
+#include "simgrid/s4u/Host.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
 
@@ -27,6 +31,7 @@ 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());
@@ -45,10 +50,11 @@ 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_->getRemains();
+  return surfAction_ ? surfAction_->getRemains() : 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())
@@ -57,6 +63,12 @@ double simgrid::kernel::activity::ExecImpl::remainingRatio()
     return surfAction_->getRemains() / surfAction_->getCost();
 }
 
+void simgrid::kernel::activity::ExecImpl::setBound(double bound)
+{
+  if (surfAction_)
+    surfAction_->setBound(bound);
+}
+
 void simgrid::kernel::activity::ExecImpl::post()
 {
   if (host_ && host_->isOff()) { /* FIXME: handle resource failure for parallel tasks too */
@@ -81,7 +93,39 @@ void simgrid::kernel::activity::ExecImpl::post()
     timeoutDetector = nullptr;
   }
 
+  onCompletion(this);
   /* If there are simcalls associated with the synchro, then answer them */
   if (not simcalls.empty())
     SIMIX_execution_finish(this);
 }
+
+simgrid::kernel::activity::ActivityImpl*
+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());
+
+    // 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->cancel();
+    oldAction->unref();
+    this->surfAction_ = newAction;
+  }
+
+  onMigration(this, to);
+  return this;
+}
+
+/*************
+ * Callbacks *
+ *************/
+simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr)> simgrid::kernel::activity::ExecImpl::onCreation;
+simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr)> simgrid::kernel::activity::ExecImpl::onCompletion;
+simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr, simgrid::s4u::Host*)> simgrid::kernel::activity::ExecImpl::onMigration;