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 2f229fe8c5e0a53b503101e70f5b11cb04bd455d..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. */
 }
 
@@ -61,48 +61,28 @@ void RawImpl::post()
   } else if (surf_action_->get_state() == resource::Action::State::FINISHED) {
     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_ == 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_));
+  } else {
+    xbt_assert(state_ == State::SRC_TIMEOUT, "Internal error in RawImpl::finish() unexpected synchro state %s",
+               to_c_str(state_));
   }
 
-  switch (simcall->call_) {
-    case simix::Simcall::MUTEX_LOCK:
-      simcall_mutex_lock__get__mutex(simcall)->remove_sleeping_actor(*simcall->issuer_);
-      break;
-
-    case simix::Simcall::COND_WAIT:
-      simcall_cond_wait_timeout__get__cond(simcall)->remove_sleeping_actor(*simcall->issuer_);
-      break;
-
-    case simix::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 simix::Simcall::SEM_ACQUIRE:
-      simcall_sem_acquire_timeout__get__sem(simcall)->remove_sleeping_actor(*simcall->issuer_);
-      break;
-
-    case simix::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;
-  }
+  finish_callback_();
   simcall->issuer_->waiting_synchro_ = nullptr;
   simcall->issuer_->simcall_answer();
 }