XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state_);
/* Associate this simcall to the synchro */
- synchro->simcalls_.push_back(simcall);
- simcall->issuer->waiting_synchro = synchro;
+ synchro->register_simcall(simcall);
- /* set surf's synchro */
- if (MC_is_active() || MC_record_replay_is_active()) {
+ if (MC_is_active() || MC_record_replay_is_active())
synchro->state_ = SIMIX_DONE;
- synchro->finish();
- return;
- }
/* If the synchro is already finished then perform the error handling */
if (synchro->state_ != SIMIX_RUNNING)
{
state_ = SIMIX_RUNNING;
surf_action_ = storage_->io_start(size_, type_);
- surf_action_->set_data(this);
+ surf_action_->set_activity(this);
XBT_DEBUG("Create IO synchro %p %s", this, get_cname());
IoImpl::on_start(*this);