Merge branch 'plugins-energy-battery-interaction' into 'master'

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

diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp
index 68382f1..6a529e8 100644 (file)
--- a/src/kernel/activity/SleepImpl.cpp
+++ b/src/kernel/activity/SleepImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2023. 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. */
@@ -8,13 +8,10 @@
 #include "src/kernel/activity/SleepImpl.hpp"
 #include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/resource/CpuImpl.hpp"
-#include "src/simix/popping_private.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_actor);
 
-namespace simgrid {
-namespace kernel {
-namespace activity {
+namespace simgrid::kernel::activity {
 
 SleepImpl& SleepImpl::set_host(s4u::Host* host)
 {
@@ -30,36 +27,31 @@ SleepImpl& SleepImpl::set_duration(double duration)
 
 SleepImpl* SleepImpl::start()
 {
-  surf_action_ = host_->get_cpu()->sleep(duration_);
-  surf_action_->set_activity(this);
+  model_action_ = host_->get_cpu()->sleep(duration_);
+  model_action_->set_activity(this);
   XBT_DEBUG("Create sleep synchronization %p", this);
   return this;
 }
 
-void SleepImpl::post()
-{
-  if (surf_action_->get_state() == resource::Action::State::FAILED) {
-    if (host_ && not host_->is_on())
-      state_ = State::SRC_HOST_FAILURE;
-    else
-      state_ = State::CANCELED;
-  } else if (surf_action_->get_state() == resource::Action::State::FINISHED) {
-    state_ = State::DONE;
-  }
-
-  clean_action();
-  /* Answer all simcalls associated with the synchro */
-  finish();
-}
 void SleepImpl::set_exception(actor::ActorImpl* issuer)
 {
   /* FIXME: Really, nothing bad can happen while we sleep? */
 }
 void SleepImpl::finish()
 {
-  XBT_DEBUG("SleepImpl::finish() in state %s", to_c_str(state_));
+  if (model_action_->get_state() == resource::Action::State::FAILED) {
+    if (host_ && not host_->is_on())
+      set_state(State::SRC_HOST_FAILURE);
+    else
+      set_state(State::CANCELED);
+  } else if (model_action_->get_state() == resource::Action::State::FINISHED) {
+    set_state(State::DONE);
+  }
+
+  clean_action();
+  XBT_DEBUG("SleepImpl::finish() in state %s", get_state_str());
   while (not simcalls_.empty()) {
-    const s_smx_simcall* simcall = simcalls_.front();
+    const actor::Simcall* simcall = simcalls_.front();
     simcalls_.pop_front();
 
     simcall->issuer_->waiting_synchro_ = nullptr;
@@ -72,6 +64,4 @@ void SleepImpl::finish()
     }
   }
 }
-} // namespace activity
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::activity