X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe304706848f0a64477d4687b3ea97d5b9a0c35c..47950eebfede4e41862022469d15e5e4fe19c7ba:/src/kernel/activity/ExecImpl.cpp

diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index 5b60a5781a..eda2b58c9f 100644
--- a/src/kernel/activity/ExecImpl.cpp
+++ b/src/kernel/activity/ExecImpl.cpp
@@ -26,24 +26,25 @@ void simcall_HANDLER_execution_wait(smx_simcall_t simcall, simgrid::kernel::acti
 
   /* set surf's synchro */
   if (MC_is_active() || MC_record_replay_is_active()) {
-    synchro->state_ = SIMIX_DONE;
+    synchro->state_ = simgrid::kernel::activity::State::DONE;
     synchro->finish();
     return;
   }
 
   /* If the synchro is already finished then perform the error handling */
-  if (synchro->state_ != SIMIX_RUNNING)
+  if (synchro->state_ != simgrid::kernel::activity::State::RUNNING)
     synchro->finish();
 }
 
 void simcall_HANDLER_execution_test(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro)
 {
-  bool res = (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING);
+  bool res = (synchro->state_ != simgrid::kernel::activity::State::WAITING &&
+              synchro->state_ != simgrid::kernel::activity::State::RUNNING);
   if (res) {
     synchro->simcalls_.push_back(simcall);
     synchro->finish();
   } else {
-    SIMIX_simcall_answer(simcall);
+    simcall->issuer_->simcall_answer();
   }
   simcall_execution_test__set__result(simcall, res);
 }
@@ -52,18 +53,18 @@ void simcall_HANDLER_execution_waitany_for(smx_simcall_t simcall, simgrid::kerne
                                            size_t count, double timeout)
 {
   if (timeout < 0.0) {
-    simcall->timer = nullptr;
+    simcall->timeout_cb_ = nullptr;
   } else {
-    simcall->timer = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall, execs, count]() {
+    simcall->timeout_cb_ = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall, execs, count]() {
       for (size_t i = 0; i < count; i++) {
-        // Remove the first occurence of simcall:
+        // Remove the first occurrence of simcall:
         auto* exec = execs[i];
         auto j     = boost::range::find(exec->simcalls_, simcall);
         if (j != exec->simcalls_.end())
           exec->simcalls_.erase(j);
       }
       simcall_execution_waitany_for__set__result(simcall, -1);
-      SIMIX_simcall_answer(simcall);
+      simcall->issuer_->simcall_answer();
     });
   }
 
@@ -73,7 +74,8 @@ void simcall_HANDLER_execution_waitany_for(smx_simcall_t simcall, simgrid::kerne
     exec->simcalls_.push_back(simcall);
 
     /* see if the synchro is already finished */
-    if (exec->state_ != SIMIX_WAITING && exec->state_ != SIMIX_RUNNING) {
+    if (exec->state_ != simgrid::kernel::activity::State::WAITING &&
+        exec->state_ != simgrid::kernel::activity::State::RUNNING) {
       exec->finish();
       break;
     }
@@ -137,11 +139,11 @@ ExecImpl& ExecImpl::set_bytes_amounts(const std::vector<double>& bytes_amounts)
 
 ExecImpl* ExecImpl::start()
 {
-  state_ = SIMIX_RUNNING;
+  state_ = State::RUNNING;
   if (not MC_is_active() && not MC_record_replay_is_active()) {
     if (hosts_.size() == 1) {
       surf_action_ = hosts_.front()->pimpl_cpu->execution_start(flops_amounts_.front());
-      surf_action_->set_priority(priority_);
+      surf_action_->set_sharing_penalty(sharing_penalty_);
       surf_action_->set_category(get_tracing_category());
 
       if (bound_ > 0)
@@ -153,7 +155,6 @@ ExecImpl* ExecImpl::start()
   }
 
   XBT_DEBUG("Create execute synchro %p: %s", this, get_cname());
-  ExecImpl::on_creation(*this);
   return this;
 }
 
@@ -174,9 +175,9 @@ ExecImpl& ExecImpl::set_bound(double bound)
   return *this;
 }
 
-ExecImpl& ExecImpl::set_priority(double priority)
+ExecImpl& ExecImpl::set_sharing_penalty(double sharing_penalty)
 {
-  priority_ = priority;
+  sharing_penalty_ = sharing_penalty;
   return *this;
 }
 
@@ -185,18 +186,16 @@ void ExecImpl::post()
   if (hosts_.size() == 1 && not hosts_.front()->is_on()) { /* FIXME: handle resource failure for parallel tasks too */
     /* If the host running the synchro failed, notice it. This way, the asking
      * process can be killed if it runs on that host itself */
-    state_ = SIMIX_FAILED;
+    state_ = State::FAILED;
   } else if (surf_action_ && surf_action_->get_state() == resource::Action::State::FAILED) {
     /* If the host running the synchro didn't fail, then the synchro was canceled */
-    state_ = SIMIX_CANCELED;
+    state_ = State::CANCELED;
   } else if (timeout_detector_ && timeout_detector_->get_state() == resource::Action::State::FINISHED) {
-    state_ = SIMIX_TIMEOUT;
+    state_ = State::TIMEOUT;
   } else {
-    state_ = SIMIX_DONE;
+    state_ = State::DONE;
   }
 
-  on_completion(*this);
-
   clean_action();
 
   if (timeout_detector_) {
@@ -204,9 +203,8 @@ void ExecImpl::post()
     timeout_detector_ = nullptr;
   }
 
-  /* If there are simcalls associated with the synchro, then answer them */
-  if (not simcalls_.empty())
-    finish();
+  /* Answer all simcalls associated with the synchro */
+  finish();
 }
 
 void ExecImpl::finish()
@@ -219,22 +217,22 @@ void ExecImpl::finish()
      * list. Afterwards, get the position of the actual synchro in the waitany list and return it as the result of the
      * simcall */
 
-    if (simcall->call == SIMCALL_NONE) // FIXME: maybe a better way to handle this case
+    if (simcall->call_ == SIMCALL_NONE) // FIXME: maybe a better way to handle this case
       continue;                        // if process handling comm is killed
-    if (simcall->call == SIMCALL_EXECUTION_WAITANY_FOR) {
+    if (simcall->call_ == SIMCALL_EXECUTION_WAITANY_FOR) {
       simgrid::kernel::activity::ExecImpl** execs = simcall_execution_waitany_for__get__execs(simcall);
       size_t count                                = simcall_execution_waitany_for__get__count(simcall);
 
       for (size_t i = 0; i < count; i++) {
-        // Remove the first occurence of simcall:
+        // Remove the first occurrence of simcall:
         auto* exec = execs[i];
         auto j     = boost::range::find(exec->simcalls_, simcall);
         if (j != exec->simcalls_.end())
           exec->simcalls_.erase(j);
 
-        if (simcall->timer) {
-          simcall->timer->remove();
-          simcall->timer = nullptr;
+        if (simcall->timeout_cb_) {
+          simcall->timeout_cb_->remove();
+          simcall->timeout_cb_ = nullptr;
         }
       }
 
@@ -247,41 +245,41 @@ void ExecImpl::finish()
 
     switch (state_) {
 
-      case SIMIX_DONE:
+      case State::DONE:
         /* do nothing, synchro done */
         XBT_DEBUG("ExecImpl::finish(): execution successful");
         break;
 
-      case SIMIX_FAILED:
-        XBT_DEBUG("ExecImpl::finish(): host '%s' failed", simcall->issuer->get_host()->get_cname());
-        simcall->issuer->context_->iwannadie = true;
-        if (simcall->issuer->get_host()->is_on())
-          simcall->issuer->exception_ =
+      case State::FAILED:
+        XBT_DEBUG("ExecImpl::finish(): host '%s' failed", simcall->issuer_->get_host()->get_cname());
+        simcall->issuer_->context_->iwannadie = true;
+        if (simcall->issuer_->get_host()->is_on())
+          simcall->issuer_->exception_ =
               std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed"));
         /* else, the actor will be killed with no possibility to survive */
         break;
 
-      case SIMIX_CANCELED:
+      case State::CANCELED:
         XBT_DEBUG("ExecImpl::finish(): execution canceled");
-        simcall->issuer->exception_ =
+        simcall->issuer_->exception_ =
             std::make_exception_ptr(simgrid::CancelException(XBT_THROW_POINT, "Execution Canceled"));
         break;
 
-      case SIMIX_TIMEOUT:
+      case State::TIMEOUT:
         XBT_DEBUG("ExecImpl::finish(): execution timeouted");
-        simcall->issuer->exception_ = std::make_exception_ptr(simgrid::TimeoutError(XBT_THROW_POINT, "Timeouted"));
+        simcall->issuer_->exception_ = std::make_exception_ptr(simgrid::TimeoutException(XBT_THROW_POINT, "Timeouted"));
         break;
 
       default:
         xbt_die("Internal error in ExecImpl::finish(): unexpected synchro state %d", static_cast<int>(state_));
     }
 
-    simcall->issuer->waiting_synchro = nullptr;
+    simcall->issuer_->waiting_synchro = nullptr;
     /* Fail the process if the host is down */
-    if (simcall->issuer->get_host()->is_on())
-      SIMIX_simcall_answer(simcall);
+    if (simcall->issuer_->get_host()->is_on())
+      simcall->issuer_->simcall_answer();
     else
-      simcall->issuer->context_->iwannadie = true;
+      simcall->issuer_->context_->iwannadie = true;
   }
 }
 
@@ -292,7 +290,7 @@ ActivityImpl* ExecImpl::migrate(s4u::Host* to)
     resource::Action* new_action = to->pimpl_cpu->execution_start(old_action->get_cost());
     new_action->set_remains(old_action->get_remains());
     new_action->set_activity(this);
-    new_action->set_priority(old_action->get_priority());
+    new_action->set_sharing_penalty(old_action->get_sharing_penalty());
 
     // 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.
@@ -310,8 +308,6 @@ ActivityImpl* ExecImpl::migrate(s4u::Host* to)
 /*************
  * Callbacks *
  *************/
-xbt::signal<void(ExecImpl&)> ExecImpl::on_creation;
-xbt::signal<void(ExecImpl const&)> ExecImpl::on_completion;
 xbt::signal<void(ExecImpl const&, s4u::Host*)> ExecImpl::on_migration;
 
 } // namespace activity