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

diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index aee76bc532..e394bdd431 100644
--- a/src/kernel/activity/ExecImpl.cpp
+++ b/src/kernel/activity/ExecImpl.cpp
@@ -6,7 +6,7 @@
 #include "simgrid/s4u/Host.hpp"
 
 #include "src/kernel/activity/ExecImpl.hpp"
-#include "src/simix/smx_host_private.h"
+#include "src/simix/smx_host_private.hpp"
 #include "src/surf/surf_interface.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
@@ -21,32 +21,40 @@ simgrid::kernel::activity::ExecImpl::ExecImpl(const char* name, sg_host_t host)
 
 simgrid::kernel::activity::ExecImpl::~ExecImpl()
 {
-  if (surf_exec)
-    surf_exec->unref();
+  if (surfAction_)
+    surfAction_->unref();
   if (timeoutDetector)
     timeoutDetector->unref();
   XBT_DEBUG("Destroy exec %p", this);
 }
 void simgrid::kernel::activity::ExecImpl::suspend()
 {
-  XBT_VERB("This exec is suspended (remain: %f)", surf_exec->getRemains());
-  if (surf_exec)
-    surf_exec->suspend();
+  XBT_VERB("This exec is suspended (remain: %f)", surfAction_->getRemains());
+  if (surfAction_)
+    surfAction_->suspend();
 }
 
 void simgrid::kernel::activity::ExecImpl::resume()
 {
-  XBT_VERB("This exec is resumed (remain: %f)", surf_exec->getRemains());
-  if (surf_exec)
-    surf_exec->resume();
+  XBT_VERB("This exec is resumed (remain: %f)", surfAction_->getRemains());
+  if (surfAction_)
+    surfAction_->resume();
 }
 
 double simgrid::kernel::activity::ExecImpl::remains()
 {
-  if (state == SIMIX_RUNNING)
-    return surf_exec->getRemains();
+  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?");
 
-  return 0;
+  return surfAction_->getRemains();
+}
+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();
+  else // Actually compute the ratio for sequential tasks
+    return surfAction_->getRemains() / surfAction_->getCost();
 }
 
 void simgrid::kernel::activity::ExecImpl::post()
@@ -55,7 +63,7 @@ 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 (surf_exec->getState() == simgrid::surf::Action::State::failed) {
+  } else if (surfAction_->getState() == simgrid::surf::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) {
@@ -64,9 +72,9 @@ void simgrid::kernel::activity::ExecImpl::post()
     state = SIMIX_DONE;
   }
 
-  if (surf_exec) {
-    surf_exec->unref();
-    surf_exec = nullptr;
+  if (surfAction_) {
+    surfAction_->unref();
+    surfAction_ = nullptr;
   }
   if (timeoutDetector) {
     timeoutDetector->unref();