Revert "use smart pointers for kernel timers"

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

diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index ce5252c..4e3f3f2 100644 (file)
--- a/src/kernel/activity/ExecImpl.cpp
+++ b/src/kernel/activity/ExecImpl.cpp
@@ -3,21 +3,19 @@
 /* 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/Exception.hpp>
+#include <simgrid/kernel/routing/NetPoint.hpp>
+#include <simgrid/modelchecker.h>
+#include <simgrid/s4u/Engine.hpp>
+
 #include "src/kernel/activity/ExecImpl.hpp"
-#include "simgrid/Exception.hpp"
-#include "simgrid/kernel/routing/NetPoint.hpp"
-#include "simgrid/modelchecker.h"
-#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Exec.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/actor/SimcallObserver.hpp"
+#include "src/kernel/resource/CpuImpl.hpp"
 #include "src/mc/mc_replay.hpp"
 #include "src/surf/HostImpl.hpp"
-#include "src/surf/cpu_interface.hpp"
-#include "src/surf/surf_interface.hpp"
-
-#include "simgrid/s4u/Host.hpp"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_actor);
 
 namespace simgrid {
 namespace kernel {
@@ -117,6 +115,13 @@ ExecImpl& ExecImpl::set_sharing_penalty(double sharing_penalty)
   return *this;
 }
 
+ExecImpl& ExecImpl::update_sharing_penalty(double sharing_penalty)
+{
+  sharing_penalty_ = sharing_penalty;
+  surf_action_->set_sharing_penalty(sharing_penalty);
+  return *this;
+}
+
 void ExecImpl::post()
 {
   xbt_assert(surf_action_ != nullptr);
@@ -146,10 +151,36 @@ void ExecImpl::post()
     actor_->activities_.remove(this);
     actor_ = nullptr;
   }
+  if (state_ != State::FAILED && cb_id_ >= 0)
+    s4u::Host::on_state_change.disconnect(cb_id_);
   /* Answer all simcalls associated with the synchro */
   finish();
 }
 
+void ExecImpl::set_exception(actor::ActorImpl* issuer)
+{
+  switch (state_) {
+    case State::FAILED:
+      piface_->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_));
@@ -157,23 +188,22 @@ void ExecImpl::finish()
     smx_simcall_t simcall = simcalls_.front();
     simcalls_.pop_front();
 
+    if (simcall->call_ == simix::Simcall::NONE) // FIXME: maybe a better way to handle this case
+      continue;                                 // if process handling comm is killed
+
     /* If a waitany simcall is waiting for this synchro to finish, then remove it from the other synchros in the waitany
      * list. Afterwards, get the position of the actual synchro in the waitany list and return it as the result of the
      * simcall */
+    if (auto* observer = dynamic_cast<actor::ExecutionWaitanySimcall*>(simcall->observer_)) {
 
-    if (simcall->call_ == simix::Simcall::NONE) // FIXME: maybe a better way to handle this case
-      continue;                                 // if process handling comm is killed
-    if (auto* observer =
-            dynamic_cast<kernel::actor::ExecutionWaitanySimcall*>(simcall->observer_)) { // simcall is a wait_any?
       const auto& execs = observer->get_execs();
 
-      for (auto* exec : execs) {
+      for (auto* exec : execs)
         exec->unregister_simcall(simcall);
 
-        if (simcall->timeout_cb_) {
-          simcall->timeout_cb_->remove();
-          simcall->timeout_cb_ = nullptr;
-        }
+      if (simcall->timeout_cb_) {
+        simcall->timeout_cb_->remove();
+        simcall->timeout_cb_ = nullptr;
       }
 
       if (not MC_is_active() && not MC_record_replay_is_active()) {
@@ -182,26 +212,8 @@ void ExecImpl::finish()
         observer->set_result(rank);
       }
     }
-    switch (state_) {
-      case State::FAILED:
-        simcall->issuer_->context_->set_wannadie();
-        if (simcall->issuer_->get_host()->is_on())
-          simcall->issuer_->exception_ = std::make_exception_ptr(HostFailureException(XBT_THROW_POINT, "Host failed"));
-        /* else, the actor will be killed with no possibility to survive */
-        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 */
@@ -249,7 +261,6 @@ void ExecImpl::wait_any_for(actor::ActorImpl* issuer, const std::vector<ExecImpl
   for (auto* exec : execs) {
     /* associate this simcall to the the synchro */
     exec->simcalls_.push_back(&issuer->simcall_);
-
     /* see if the synchro is already finished */
     if (exec->state_ != State::WAITING && exec->state_ != State::RUNNING) {
       exec->finish();