X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9e34d715bca0465a05c87301f6d0238d1a516c74..b2852b7c61948f495d7437ffaa7fd9aced12849c:/src/kernel/activity/SleepImpl.cpp

diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp
index 78813f718b..6a529e8cd6 100644
--- 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. */
@@ -11,9 +11,7 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_actor);
 
-namespace simgrid {
-namespace kernel {
-namespace activity {
+namespace simgrid::kernel::activity {
 
 SleepImpl& SleepImpl::set_host(s4u::Host* host)
 {
@@ -29,33 +27,28 @@ 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()
+void SleepImpl::set_exception(actor::ActorImpl* issuer)
+{
+  /* FIXME: Really, nothing bad can happen while we sleep? */
+}
+void SleepImpl::finish()
 {
-  if (surf_action_->get_state() == resource::Action::State::FAILED) {
+  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 (surf_action_->get_state() == resource::Action::State::FINISHED) {
+  } else if (model_action_->get_state() == resource::Action::State::FINISHED) {
     set_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", get_state_str());
   while (not simcalls_.empty()) {
     const actor::Simcall* simcall = simcalls_.front();
@@ -71,6 +64,4 @@ void SleepImpl::finish()
     }
   }
 }
-} // namespace activity
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::activity