#include "src/kernel/activity/SynchroRaw.hpp"
#include "simgrid/kernel/resource/Action.hpp"
+#include "src/kernel/context/Context.hpp"
#include "src/simix/smx_synchro_private.hpp"
#include "src/surf/surf_interface.hpp"
void RawImpl::post()
{
XBT_IN("(%p)",this);
- if (surf_action_->get_state() == resource::Action::State::FAILED)
+ smx_simcall_t simcall = simcalls_.front();
+ simcalls_.pop_front();
+
+ SIMIX_synchro_stop_waiting(simcall->issuer, simcall);
+ simcall->issuer->waiting_synchro = nullptr;
+
+ if (surf_action_->get_state() == resource::Action::State::FAILED) {
state_ = SIMIX_FAILED;
- else if (surf_action_->get_state() == resource::Action::State::FINISHED)
+ simcall->issuer->context_->iwannadie = true;
+ } else if (surf_action_->get_state() == resource::Action::State::FINISHED) {
state_ = SIMIX_SRC_TIMEOUT;
-
- SIMIX_synchro_finish(this);
+ SIMIX_simcall_answer(simcall);
+ }
XBT_OUT();
}
} // namespace activity
}
XBT_OUT();
}
-
-void SIMIX_synchro_finish(smx_activity_t synchro)
-{
- XBT_IN("(%p)", synchro.get());
- smx_simcall_t simcall = synchro->simcalls_.front();
- synchro->simcalls_.pop_front();
-
- SIMIX_synchro_stop_waiting(simcall->issuer, simcall);
- simcall->issuer->waiting_synchro = nullptr;
-
- if (synchro->state_ != SIMIX_SRC_TIMEOUT) {
- xbt_assert(synchro->state_ == SIMIX_FAILED);
- simcall->issuer->context_->iwannadie = true;
- } else {
- SIMIX_simcall_answer(simcall);
- }
- XBT_OUT();
-}
smx_activity_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout);
XBT_PRIVATE void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall);
-XBT_PRIVATE void SIMIX_synchro_finish(smx_activity_t synchro);
#endif