factor simcall/activity binding

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

diff --git a/src/kernel/activity/IoImpl.cpp b/src/kernel/activity/IoImpl.cpp
index 8684066..db99089 100644 (file)
--- a/src/kernel/activity/IoImpl.cpp
+++ b/src/kernel/activity/IoImpl.cpp
@@ -18,8 +18,7 @@ void simcall_HANDLER_io_wait(smx_simcall_t simcall, simgrid::kernel::activity::I
   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()) {
@@ -59,7 +58,7 @@ IoImpl* IoImpl::start()
 {
   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);