Modernize simcall mutex_unlock.

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

diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index 29b0ed4..0e38011 100644 (file)
--- a/src/kernel/activity/ExecImpl.cpp
+++ b/src/kernel/activity/ExecImpl.cpp
@@ -1,8 +1,9 @@
-/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "simgrid/s4u/Exec.hpp"
 #include "src/kernel/activity/ExecImpl.hpp"
 #include "simgrid/Exception.hpp"
 #include "simgrid/modelchecker.h"
@@ -57,10 +58,11 @@ namespace activity {
 
 ExecImpl::ExecImpl()
 {
+  piface_ = new s4u::Exec(this);
   actor::ActorImpl* self = actor::ActorImpl::self();
   if (self) {
     actor_ = self;
-    self->activities.push_back(this);
+    self->activities_.emplace_back(this);
   }
 }
 
@@ -78,7 +80,7 @@ ExecImpl& ExecImpl::set_hosts(const std::vector<s4u::Host*>& hosts)
 
 ExecImpl& ExecImpl::set_timeout(double timeout)
 {
-  if (timeout > 0 && not MC_is_active() && not MC_record_replay_is_active()) {
+  if (timeout >= 0 && not MC_is_active() && not MC_record_replay_is_active()) {
     timeout_detector_.reset(hosts_.front()->pimpl_cpu->sleep(timeout));
     timeout_detector_->set_activity(this);
   }
@@ -150,11 +152,12 @@ ExecImpl& ExecImpl::set_sharing_penalty(double sharing_penalty)
 
 void ExecImpl::post()
 {
+  xbt_assert(surf_action_ != nullptr);
   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_ = State::FAILED;
-  } else if (surf_action_ && surf_action_->get_state() == resource::Action::State::FAILED) {
+  } else if (surf_action_->get_state() == resource::Action::State::FAILED) {
     /* If the host running the synchro didn't fail, then the synchro was canceled */
     state_ = State::CANCELED;
   } else if (timeout_detector_ && timeout_detector_->get_state() == resource::Action::State::FINISHED) {
@@ -163,10 +166,12 @@ void ExecImpl::post()
     state_ = State::DONE;
   }
 
+  get_iface()->set_finish_time(surf_action_->get_finish_time());
+
   clean_action();
   timeout_detector_.reset();
   if (actor_) {
-    actor_->activities.remove(this);
+    actor_->activities_.remove(this);
     actor_ = nullptr;
   }
   /* Answer all simcalls associated with the synchro */
@@ -183,9 +188,9 @@ 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_ == simix::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_ == simix::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);
 
@@ -208,7 +213,6 @@ void ExecImpl::finish()
         simcall_execution_waitany_for__set__result(simcall, rank);
       }
     }
-
     switch (state_) {
       case State::DONE:
         /* do nothing, synchro done */
@@ -239,7 +243,7 @@ void ExecImpl::finish()
         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())
       simcall->issuer_->simcall_answer();