X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6e35d104466c5af941948ce10c8b0b9bfd514797..d662c9d9b90723961229e619d980e28d2d66ef6d:/src/kernel/activity/SleepImpl.cpp

diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp
index 2809eeb8de..e5477aaac1 100644
--- a/src/kernel/activity/SleepImpl.cpp
+++ b/src/kernel/activity/SleepImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. 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. */
@@ -17,16 +17,6 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
 
-void simgrid::kernel::activity::SleepImpl::suspend()
-{
-  surf_sleep->suspend();
-}
-
-void simgrid::kernel::activity::SleepImpl::resume()
-{
-  surf_sleep->resume();
-}
-
 void simgrid::kernel::activity::SleepImpl::post()
 {
   while (not simcalls_.empty()) {
@@ -37,13 +27,13 @@ void simgrid::kernel::activity::SleepImpl::post()
       /* 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;
-      simcall->issuer->exception =
-          std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed"));
+      simcall->issuer->throw_exception(
+          std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed")));
     }
 
-    switch (surf_sleep->get_state()) {
+    switch (surf_action_->get_state()) {
       case simgrid::kernel::resource::Action::State::FAILED:
-        simcall->issuer->context_->iwannadie = 1;
+        simcall->issuer->context_->iwannadie = true;
         result                               = SIMIX_FAILED;
         break;
 
@@ -56,13 +46,13 @@ void simgrid::kernel::activity::SleepImpl::post()
         break;
     }
     if (simcall->issuer->host_->is_off()) {
-      simcall->issuer->context_->iwannadie = 1;
+      simcall->issuer->context_->iwannadie = true;
     }
     simcall_process_sleep__set__result(simcall, result);
     simcall->issuer->waiting_synchro = nullptr;
     if (simcall->issuer->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);