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

diff --git a/src/kernel/activity/SynchroRaw.cpp b/src/kernel/activity/SynchroRaw.cpp
index 5b3efd5c5a..171199b70d 100644
--- a/src/kernel/activity/SynchroRaw.cpp
+++ b/src/kernel/activity/SynchroRaw.cpp
@@ -1,32 +1,41 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2020. 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 "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/context/Context.hpp"
-#include "src/simix/smx_synchro_private.hpp"
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/surf_interface.hpp"
 #include <simgrid/s4u/Host.hpp>
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_synchro);
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix, "SIMIX Synchronization (mutex, semaphores and conditions)");
 
 namespace simgrid {
 namespace kernel {
 namespace activity {
 
-RawImpl* RawImpl::start(s4u::Host* host, double timeout)
+RawImpl& RawImpl::set_host(s4u::Host* host)
 {
-  surf_action_ = host->pimpl_cpu->sleep(timeout);
-  surf_action_->set_data(this);
-  return this;
+  host_ = host;
+  return *this;
+}
+RawImpl& RawImpl::set_timeout(double timeout)
+{
+  timeout_ = timeout;
+  return *this;
 }
 
-RawImpl::~RawImpl()
+RawImpl* RawImpl::start()
 {
-  surf_action_->unref();
+  surf_action_ = host_->pimpl_cpu->sleep(timeout_);
+  surf_action_->set_activity(this);
+  return this;
 }
 
 void RawImpl::suspend()
@@ -39,24 +48,65 @@ void RawImpl::resume()
   /* I cannot resume raw synchros directly. This is delayed to when the process is rescheduled at
    * the end of the synchro. */
 }
+
+void RawImpl::cancel()
+{
+  /* I cannot cancel raw synchros directly. */
+}
+
 void RawImpl::post()
 {
-  XBT_IN("(%p)",this);
+  if (surf_action_->get_state() == resource::Action::State::FAILED) {
+    state_ = State::FAILED;
+  } else if (surf_action_->get_state() == resource::Action::State::FINISHED) {
+    state_ = State::SRC_TIMEOUT;
+  }
+  finish();
+}
+
+void RawImpl::finish()
+{
   smx_simcall_t simcall = simcalls_.front();
   simcalls_.pop_front();
 
-  SIMIX_synchro_stop_waiting(simcall->issuer, simcall);
-  simcall->issuer->waiting_synchro = nullptr;
+  if (state_ == State::FAILED) {
+    XBT_DEBUG("RawImpl::finish(): host '%s' failed", simcall->issuer_->get_host()->get_cname());
+    simcall->issuer_->context_->set_wannadie();
+    simcall->issuer_->exception_ = std::make_exception_ptr(HostFailureException(XBT_THROW_POINT, "Host failed"));
+  } else if (state_ != State::SRC_TIMEOUT) {
+    xbt_die("Internal error in RawImpl::finish() unexpected synchro state %d", static_cast<int>(state_));
+  }
+
+  switch (simcall->call_) {
+    case SIMCALL_MUTEX_LOCK:
+      simcall_mutex_lock__get__mutex(simcall)->remove_sleeping_actor(*simcall->issuer_);
+      break;
 
-  if (surf_action_->get_state() == resource::Action::State::FAILED) {
-    state_ = SIMIX_FAILED;
-    simcall->issuer->context_->iwannadie = true;
-  } else if (surf_action_->get_state() == resource::Action::State::FINISHED) {
-    state_ = SIMIX_SRC_TIMEOUT;
-    SIMIX_simcall_answer(simcall);
+    case SIMCALL_COND_WAIT:
+      simcall_cond_wait_timeout__get__cond(simcall)->remove_sleeping_actor(*simcall->issuer_);
+      break;
+
+    case SIMCALL_COND_WAIT_TIMEOUT:
+      simcall_cond_wait_timeout__get__cond(simcall)->remove_sleeping_actor(*simcall->issuer_);
+      simcall_cond_wait_timeout__set__result(simcall, 1); // signal a timeout
+      break;
+
+    case SIMCALL_SEM_ACQUIRE:
+      simcall_sem_acquire_timeout__get__sem(simcall)->remove_sleeping_actor(*simcall->issuer_);
+      break;
+
+    case SIMCALL_SEM_ACQUIRE_TIMEOUT:
+      simcall_sem_acquire_timeout__get__sem(simcall)->remove_sleeping_actor(*simcall->issuer_);
+      simcall_sem_acquire_timeout__set__result(simcall, 1); // signal a timeout
+      break;
+
+    default:
+      THROW_IMPOSSIBLE;
   }
-  XBT_OUT();
+  simcall->issuer_->waiting_synchro = nullptr;
+  simcall->issuer_->simcall_answer();
 }
+
 } // namespace activity
 } // namespace kernel
 } // namespace simgrid