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

diff --git a/src/kernel/activity/SynchroRaw.cpp b/src/kernel/activity/SynchroRaw.cpp
index 509c41d5cd..60d8f806f7 100644
--- a/src/kernel/activity/SynchroRaw.cpp
+++ b/src/kernel/activity/SynchroRaw.cpp
@@ -1,36 +1,94 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2022. 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 "src/surf/surf_interface.hpp"
-#include "src/simix/smx_synchro_private.h"
+#include "src/kernel/actor/ActorImpl.hpp"
+#include "src/kernel/context/Context.hpp"
+#include "src/kernel/resource/CpuImpl.hpp"
+#include "src/simix/popping_private.hpp"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_synchro, kernel,
+                                "Kernel synchronization mechanisms (mutex, semaphores and conditions)");
+
+namespace simgrid {
+namespace kernel {
+namespace activity {
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_synchro);
+RawImpl& RawImpl::set_host(s4u::Host* host)
+{
+  host_ = host;
+  return *this;
+}
+RawImpl& RawImpl::set_timeout(double timeout)
+{
+  timeout_ = timeout;
+  return *this;
+}
 
-simgrid::kernel::activity::RawImpl::~RawImpl()
+RawImpl* RawImpl::start()
 {
-  sleep->unref();
+  surf_action_ = host_->get_cpu()->sleep(timeout_);
+  surf_action_->set_activity(this);
+  return this;
 }
-void simgrid::kernel::activity::RawImpl::suspend()
+
+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 simgrid::kernel::activity::RawImpl::resume()
+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. */
 }
-void simgrid::kernel::activity::RawImpl::post()
+
+void RawImpl::cancel()
+{
+  /* I cannot cancel raw synchros directly. */
+}
+
+void RawImpl::post()
+{
+  if (surf_action_->get_state() == resource::Action::State::FAILED)
+    set_state(State::FAILED);
+  else if (surf_action_->get_state() == resource::Action::State::FINISHED)
+    set_state(State::SRC_TIMEOUT);
+
+  clean_action();
+  /* Answer all simcalls associated with the synchro */
+  finish();
+}
+void RawImpl::set_exception(actor::ActorImpl* issuer)
 {
-  XBT_IN("(%p)",this);
-  if (sleep->getState() == simgrid::surf::Action::State::failed)
-    state = SIMIX_FAILED;
-  else if(sleep->getState() == simgrid::surf::Action::State::done)
-    state = SIMIX_SRC_TIMEOUT;
+  if (get_state() == State::FAILED) {
+    issuer->context_->set_wannadie();
+    issuer->exception_ = std::make_exception_ptr(HostFailureException(XBT_THROW_POINT, "Host failed"));
+  } else {
+    xbt_assert(get_state() == State::SRC_TIMEOUT, "Internal error in RawImpl::finish() unexpected synchro state %s",
+               get_state_str());
+  }
+}
+
+void RawImpl::finish()
+{
+  XBT_DEBUG("RawImpl::finish() in state %s", get_state_str());
+  xbt_assert(simcalls_.size() == 1, "Unexpected number of simcalls waiting: %zu", simcalls_.size());
+  smx_simcall_t simcall = simcalls_.front();
+  simcalls_.pop_front();
 
-  SIMIX_synchro_finish(this);
-  XBT_OUT();
+  set_exception(simcall->issuer_);
+
+  finish_callback_();
+  simcall->issuer_->waiting_synchro_ = nullptr;
+  simcall->issuer_->simcall_answer();
 }
+
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid