Merge branch 'no_simix_global'

[simgrid.git] / src / kernel / activity / SynchroRaw.cpp

diff --git a/src/kernel/activity/SynchroRaw.cpp b/src/kernel/activity/SynchroRaw.cpp
index 5b8950c25018c567b294da3a244590bc2c328d93..2fe20823eb347911122e85e6f25db02161b61bf4 100644 (file)
--- a/src/kernel/activity/SynchroRaw.cpp
+++ b/src/kernel/activity/SynchroRaw.cpp
@@ -33,19 +33,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. */
 }
 
@@ -69,16 +69,17 @@ void RawImpl::post()
 
 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_ == 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 {
-    xbt_assert(state_ == State::SRC_TIMEOUT, "Internal error in RawImpl::finish() unexpected synchro state %d",
-               static_cast<int>(state_));
+    xbt_assert(state_ == State::SRC_TIMEOUT, "Internal error in RawImpl::finish() unexpected synchro state %s",
+               to_c_str(state_));
   }
 
   finish_callback_();