X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/96cedde3cdbc0b8ffc3f096a1b65d021b0226f99..121e8462d6b912a252a9016683d2e3e021cde9a0:/src/kernel/activity/SleepImpl.cpp

diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp
index efe42c4f79..edabd248fa 100644
--- a/src/kernel/activity/SleepImpl.cpp
+++ b/src/kernel/activity/SleepImpl.cpp
@@ -8,32 +8,39 @@
 #include "simgrid/kernel/resource/Action.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/context/Context.hpp"
-
-#include "simgrid/Exception.hpp"
 #include "src/simix/ActorImpl.hpp"
 #include "src/simix/popping_private.hpp"
 #include "src/simix/smx_private.hpp"
+#include "src/surf/cpu_interface.hpp"
 #include "src/surf/surf_interface.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
+namespace simgrid {
+namespace kernel {
+namespace activity {
 
-void simgrid::kernel::activity::SleepImpl::suspend()
+SleepImpl::~SleepImpl()
 {
-  surf_sleep->suspend();
+  if (surf_action_)
+    surf_action_->unref();
+  XBT_DEBUG("Destroy activity %p", this);
 }
 
-void simgrid::kernel::activity::SleepImpl::resume()
+SleepImpl* SleepImpl::start(double duration)
 {
-  surf_sleep->resume();
+  surf_action_ = host_->pimpl_cpu->sleep(duration);
+  surf_action_->set_data(this);
+  XBT_DEBUG("Create sleep synchronization %p", this);
+  return this;
 }
 
-void simgrid::kernel::activity::SleepImpl::post()
+void SleepImpl::post()
 {
   while (not simcalls_.empty()) {
     smx_simcall_t simcall = simcalls_.front();
     simcalls_.pop_front();
     e_smx_state_t result;
-    if (host && host->is_off()) {
+    if (host_ && not host_->is_on()) {
       /* If the host running the synchro failed, notice it. This way, the asking
        * actor can be killed if it runs on that host itself */
       result = SIMIX_SRC_HOST_FAILURE;
@@ -41,13 +48,13 @@ void simgrid::kernel::activity::SleepImpl::post()
           std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed")));
     }
 
-    switch (surf_sleep->get_state()) {
-      case simgrid::kernel::resource::Action::State::FAILED:
-        simcall->issuer->context_->iwannadie = 1;
+    switch (surf_action_->get_state()) {
+      case resource::Action::State::FAILED:
+        simcall->issuer->context_->iwannadie = true;
         result                               = SIMIX_FAILED;
         break;
 
-      case simgrid::kernel::resource::Action::State::FINISHED:
+      case resource::Action::State::FINISHED:
         result = SIMIX_DONE;
         break;
 
@@ -55,14 +62,14 @@ void simgrid::kernel::activity::SleepImpl::post()
         THROW_IMPOSSIBLE;
         break;
     }
-    if (simcall->issuer->host_->is_off()) {
-      simcall->issuer->context_->iwannadie = 1;
+    if (not simcall->issuer->get_host()->is_on()) {
+      simcall->issuer->context_->iwannadie = true;
     }
     simcall_process_sleep__set__result(simcall, result);
     simcall->issuer->waiting_synchro = nullptr;
-    if (simcall->issuer->suspended_) {
+    if (simcall->issuer->is_suspended()) {
       XBT_DEBUG("Wait! This process is suspended and can't wake up now.");
-      simcall->issuer->suspended_ = 0;
+      simcall->issuer->suspended_ = false;
       simcall_HANDLER_process_suspend(simcall, simcall->issuer);
     } else {
       SIMIX_simcall_answer(simcall);
@@ -71,3 +78,10 @@ void simgrid::kernel::activity::SleepImpl::post()
 
   SIMIX_process_sleep_destroy(this);
 }
+void SleepImpl::finish()
+{
+  /* FIXME some part of post should move to finish */
+}
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid