Fix ExecImpl::get_remaining to return the right value when not started

diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index 4e3f3f2..a7f68d4 100644 (file)
--- a/src/kernel/activity/ExecImpl.cpp
+++ b/src/kernel/activity/ExecImpl.cpp
@@ -92,14 +92,25 @@ ExecImpl* ExecImpl::start()
   return this;
 }
 
+double ExecImpl::get_remaining() const
+{
+  if (state_ == State::WAITING)
+    return flops_amounts_.front();
+  return ActivityImpl::get_remaining();
+}
+
 double ExecImpl::get_seq_remaining_ratio()
 {
+  if (state_ == State::WAITING)
+    return 1;
   return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost();
 }
 
 double ExecImpl::get_par_remaining_ratio()
 {
   // parallel task: their remain is already between 0 and 1
+  if (state_ == State::WAITING)
+    return 1;
   return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains();
 }
 

diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp
index 7bfc430..ac8b8c8 100644 (file)
--- a/src/kernel/activity/ExecImpl.hpp
+++ b/src/kernel/activity/ExecImpl.hpp
@@ -55,6 +55,7 @@ public:
   unsigned int get_host_number() const { return hosts_.size(); }
   double get_seq_remaining_ratio();
   double get_par_remaining_ratio();
+  double get_remaining() const override;
   virtual ActivityImpl* migrate(s4u::Host* to);
 
   ExecImpl* start();