factor simcall/activity binding

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

diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index 476723f..8e1c3e8 100644 (file)
--- a/src/kernel/activity/ExecImpl.cpp
+++ b/src/kernel/activity/ExecImpl.cpp
@@ -20,8 +20,7 @@ void simcall_HANDLER_execution_wait(smx_simcall_t simcall, simgrid::kernel::acti
   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()) {
@@ -37,7 +36,7 @@ void simcall_HANDLER_execution_wait(smx_simcall_t simcall, simgrid::kernel::acti
 
 void simcall_HANDLER_execution_test(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro)
 {
-  int res = (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING);
+  bool res = (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING);
   if (res) {
     synchro->simcalls_.push_back(simcall);
     synchro->finish();
@@ -76,7 +75,7 @@ ExecImpl& ExecImpl::set_timeout(double timeout)
 {
   if (timeout > 0 && not MC_is_active() && not MC_record_replay_is_active()) {
     timeout_detector_ = hosts_.front()->pimpl_cpu->sleep(timeout);
-    timeout_detector_->set_data(this);
+    timeout_detector_->set_activity(this);
   }
   return *this;
 }
@@ -116,7 +115,7 @@ ExecImpl* ExecImpl::start()
     } else {
       surf_action_ = surf_host_model->execute_parallel(hosts_, flops_amounts_.data(), bytes_amounts_.data(), -1);
     }
-    surf_action_->set_data(this);
+    surf_action_->set_activity(this);
   }
 
   XBT_DEBUG("Create execute synchro %p: %s", this, get_cname());
@@ -124,13 +123,6 @@ ExecImpl* ExecImpl::start()
   return this;
 }
 
-void ExecImpl::cancel()
-{
-  XBT_VERB("This exec %p is canceled", this);
-  if (surf_action_ != nullptr)
-    surf_action_->cancel();
-}
-
 double ExecImpl::get_seq_remaining_ratio()
 {
   return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost();
@@ -171,10 +163,8 @@ void ExecImpl::post()
 
   on_completion(*this);
 
-  if (surf_action_) {
-    surf_action_->unref();
-    surf_action_ = nullptr;
-  }
+  clean_action();
+
   if (timeout_detector_) {
     timeout_detector_->unref();
     timeout_detector_ = nullptr;
@@ -238,13 +228,13 @@ ActivityImpl* ExecImpl::migrate(s4u::Host* to)
     resource::Action* old_action = this->surf_action_;
     resource::Action* new_action = to->pimpl_cpu->execution_start(old_action->get_cost());
     new_action->set_remains(old_action->get_remains());
-    new_action->set_data(this);
+    new_action->set_activity(this);
     new_action->set_priority(old_action->get_priority());
 
     // FIXME: the user-defined bound seem to not be kept by LMM, that seem to overwrite it for the multi-core modeling.
     // I hope that the user did not provide any.
 
-    old_action->set_data(nullptr);
+    old_action->set_activity(nullptr);
     old_action->cancel();
     old_action->unref();
     this->surf_action_ = new_action;