X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe304706848f0a64477d4687b3ea97d5b9a0c35c..a9dc23242c8a8a0084ad22a773b450dcd57f9f3c:/src/kernel/activity/SynchroRaw.cpp

diff --git a/src/kernel/activity/SynchroRaw.cpp b/src/kernel/activity/SynchroRaw.cpp
index facb9d00ac..c01df2b4fc 100644
--- a/src/kernel/activity/SynchroRaw.cpp
+++ b/src/kernel/activity/SynchroRaw.cpp
@@ -1,18 +1,16 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2021. 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. */
 
+#include <simgrid/Exception.hpp>
+#include <simgrid/s4u/Host.hpp>
+
 #include "src/kernel/activity/SynchroRaw.hpp"
-#include "simgrid/Exception.hpp"
-#include "simgrid/kernel/resource/Action.hpp"
-#include "src/kernel/activity/ConditionVariableImpl.hpp"
-#include "src/kernel/activity/MutexImpl.hpp"
-#include "src/kernel/activity/SemaphoreImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/context/Context.hpp"
+#include "src/simix/popping_private.hpp"
 #include "src/surf/cpu_interface.hpp"
-#include "src/surf/surf_interface.hpp"
-#include <simgrid/s4u/Host.hpp>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix, "SIMIX Synchronization (mutex, semaphores and conditions)");
 
@@ -33,19 +31,19 @@ RawImpl& RawImpl::set_timeout(double timeout)
 
 RawImpl* RawImpl::start()
 {
-  surf_action_ = host_->pimpl_cpu->sleep(timeout_);
+  surf_action_ = host_->get_cpu()->sleep(timeout_);
   surf_action_->set_activity(this);
   return this;
 }
 
 void RawImpl::suspend()
 {
-  /* The suspension of raw synchros is delayed to when the process is rescheduled. */
+  /* The suspension of raw synchros is delayed to when the actor is rescheduled. */
 }
 
 void RawImpl::resume()
 {
-  /* I cannot resume raw synchros directly. This is delayed to when the process is rescheduled at
+  /* I cannot resume raw synchros directly. This is delayed to when the actor is rescheduled at
    * the end of the synchro. */
 }
 
@@ -57,55 +55,34 @@ void RawImpl::cancel()
 void RawImpl::post()
 {
   if (surf_action_->get_state() == resource::Action::State::FAILED) {
-    state_ = SIMIX_FAILED;
+    state_ = State::FAILED;
   } else if (surf_action_->get_state() == resource::Action::State::FINISHED) {
-    state_ = SIMIX_SRC_TIMEOUT;
+    state_ = State::SRC_TIMEOUT;
   }
+
+  clean_action();
+  /* Answer all simcalls associated with the synchro */
   finish();
 }
 
 void RawImpl::finish()
 {
+  XBT_DEBUG("RawImpl::finish() in state %s", to_c_str(state_));
+  xbt_assert(simcalls_.size() == 1, "Unexpected number of simcalls waiting: %zu", simcalls_.size());
   smx_simcall_t simcall = simcalls_.front();
   simcalls_.pop_front();
 
-  if (state_ == SIMIX_FAILED) {
-    XBT_DEBUG("RawImpl::finish(): host '%s' failed", simcall->issuer->get_host()->get_cname());
-    simcall->issuer->context_->iwannadie = true;
-    simcall->issuer->exception_ = std::make_exception_ptr(HostFailureException(XBT_THROW_POINT, "Host failed"));
-  } else if (state_ != SIMIX_SRC_TIMEOUT) {
-    xbt_die("Internal error in RawImpl::finish() unexpected synchro state %d", static_cast<int>(state_));
+  if (state_ == State::FAILED) {
+    simcall->issuer_->context_->set_wannadie();
+    simcall->issuer_->exception_ = std::make_exception_ptr(HostFailureException(XBT_THROW_POINT, "Host failed"));
+  } else {
+    xbt_assert(state_ == State::SRC_TIMEOUT, "Internal error in RawImpl::finish() unexpected synchro state %s",
+               to_c_str(state_));
   }
 
-  switch (simcall->call) {
-
-    case SIMCALL_MUTEX_LOCK:
-      simgrid::xbt::intrusive_erase(simcall_mutex_lock__get__mutex(simcall)->sleeping_, *simcall->issuer);
-      break;
-
-    case SIMCALL_COND_WAIT:
-      simgrid::xbt::intrusive_erase(simcall_cond_wait__get__cond(simcall)->sleeping_, *simcall->issuer);
-      break;
-
-    case SIMCALL_COND_WAIT_TIMEOUT:
-      simgrid::xbt::intrusive_erase(simcall_cond_wait_timeout__get__cond(simcall)->sleeping_, *simcall->issuer);
-      simcall_cond_wait_timeout__set__result(simcall, 1); // signal a timeout
-      break;
-
-    case SIMCALL_SEM_ACQUIRE:
-      simgrid::xbt::intrusive_erase(simcall_sem_acquire__get__sem(simcall)->sleeping_, *simcall->issuer);
-      break;
-
-    case SIMCALL_SEM_ACQUIRE_TIMEOUT:
-      simgrid::xbt::intrusive_erase(simcall_sem_acquire_timeout__get__sem(simcall)->sleeping_, *simcall->issuer);
-      simcall_sem_acquire_timeout__set__result(simcall, 1); // signal a timeout
-      break;
-
-    default:
-      THROW_IMPOSSIBLE;
-  }
-  simcall->issuer->waiting_synchro = nullptr;
-  SIMIX_simcall_answer(simcall);
+  finish_callback_();
+  simcall->issuer_->waiting_synchro_ = nullptr;
+  simcall->issuer_->simcall_answer();
 }
 
 } // namespace activity