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

diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index 08c6717b20..9b97aab59e 100644
--- a/src/kernel/activity/ExecImpl.cpp
+++ b/src/kernel/activity/ExecImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2022. 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. */
@@ -26,7 +26,7 @@ ExecImpl::ExecImpl()
   piface_                = new s4u::Exec(this);
   actor::ActorImpl* self = actor::ActorImpl::self();
   if (self) {
-    actor_ = self;
+    set_actor(self);
     self->activities_.emplace_back(this);
   }
 }
@@ -92,14 +92,25 @@ ExecImpl* ExecImpl::start()
   return this;
 }
 
+double ExecImpl::get_remaining() const
+{
+  if (state_ == State::WAITING || state_ == State::FAILED)
+    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();
 }
 
@@ -143,13 +154,10 @@ void ExecImpl::post()
     state_ = State::DONE;
   }
 
-  finish_time_ = surf_action_->get_finish_time();
-
   clean_action();
   timeout_detector_.reset();
-  if (actor_) {
-    actor_->activities_.remove(this);
-    actor_ = nullptr;
+  if (get_actor() != nullptr) {
+    get_actor()->activities_.remove(this);
   }
   if (state_ != State::FAILED && cb_id_ >= 0)
     s4u::Host::on_state_change.disconnect(cb_id_);
@@ -157,6 +165,30 @@ void ExecImpl::post()
   finish();
 }
 
+void ExecImpl::set_exception(actor::ActorImpl* issuer)
+{
+  switch (state_) {
+    case State::FAILED:
+      static_cast<s4u::Exec*>(get_iface())->complete(s4u::Activity::State::FAILED);
+      if (issuer->get_host()->is_on())
+        issuer->exception_ = std::make_exception_ptr(HostFailureException(XBT_THROW_POINT, "Host failed"));
+      else /* else, the actor will be killed with no possibility to survive */
+        issuer->context_->set_wannadie();
+      break;
+
+    case State::CANCELED:
+      issuer->exception_ = std::make_exception_ptr(CancelException(XBT_THROW_POINT, "Execution Canceled"));
+      break;
+
+    case State::TIMEOUT:
+      issuer->exception_ = std::make_exception_ptr(TimeoutException(XBT_THROW_POINT, "Timeouted"));
+      break;
+
+    default:
+      xbt_assert(state_ == State::DONE, "Internal error in ExecImpl::finish(): unexpected synchro state %s",
+                 to_c_str(state_));
+  }
+}
 void ExecImpl::finish()
 {
   XBT_DEBUG("ExecImpl::finish() in state %s", to_c_str(state_));
@@ -189,27 +221,7 @@ void ExecImpl::finish()
       }
     }
 
-    switch (state_) {
-      case State::FAILED:
-        piface_->complete(s4u::Activity::State::FAILED);
-        if (simcall->issuer_->get_host()->is_on())
-          simcall->issuer_->exception_ = std::make_exception_ptr(HostFailureException(XBT_THROW_POINT, "Host failed"));
-        else /* else, the actor will be killed with no possibility to survive */
-          simcall->issuer_->context_->set_wannadie();
-        break;
-
-      case State::CANCELED:
-        simcall->issuer_->exception_ = std::make_exception_ptr(CancelException(XBT_THROW_POINT, "Execution Canceled"));
-        break;
-
-      case State::TIMEOUT:
-        simcall->issuer_->exception_ = std::make_exception_ptr(TimeoutException(XBT_THROW_POINT, "Timeouted"));
-        break;
-
-      default:
-        xbt_assert(state_ == State::DONE, "Internal error in ExecImpl::finish(): unexpected synchro state %s",
-                   to_c_str(state_));
-    }
+    set_exception(simcall->issuer_);
 
     simcall->issuer_->waiting_synchro_ = nullptr;
     /* Fail the process if the host is down */
@@ -220,6 +232,14 @@ void ExecImpl::finish()
   }
 }
 
+void ExecImpl::reset()
+{
+  hosts_.clear();
+  bytes_amounts_.clear();
+  flops_amounts_.clear();
+  start_time_ = -1.0;
+}
+
 ActivityImpl* ExecImpl::migrate(s4u::Host* to)
 {
   if (not MC_is_active() && not MC_record_replay_is_active()) {