X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/078a96e4b84369c23073bb68e15273030e9a357b..f3978ee8083967b9249494916e755a3a855435d0:/src/kernel/activity/ActivityImpl.cpp

diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp
index d50f13ccfd..70e80323d3 100644
--- a/src/kernel/activity/ActivityImpl.cpp
+++ b/src/kernel/activity/ActivityImpl.cpp
@@ -1,9 +1,16 @@
-/* Copyright (c) 2007-2019. 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 "src/kernel/activity/ActivityImpl.hpp"
+#include "simgrid/modelchecker.h"
+#include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/kernel/actor/SimcallObserver.hpp"
+#include "src/mc/mc_replay.hpp"
+#include "src/simix/smx_private.hpp"
+#include <boost/range/algorithm.hpp>
+#include <cmath> // isfinite()
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
 
@@ -12,14 +19,79 @@ namespace kernel {
 namespace activity {
 
 ActivityImpl::~ActivityImpl()
+{
+  clean_action();
+  XBT_DEBUG("Destroy activity %p", this);
+}
+
+void ActivityImpl::register_simcall(smx_simcall_t simcall)
+{
+  simcalls_.push_back(simcall);
+  simcall->issuer_->waiting_synchro_ = this;
+}
+
+void ActivityImpl::unregister_simcall(smx_simcall_t simcall)
+{
+  // Remove the first occurrence of simcall:
+  auto j = boost::range::find(simcalls_, simcall);
+  if (j != simcalls_.end())
+    simcalls_.erase(j);
+}
+
+void ActivityImpl::clean_action()
 {
   if (surf_action_) {
     surf_action_->unref();
-    XBT_DEBUG("Destroy activity %p", this);
     surf_action_ = nullptr;
   }
 }
 
+double ActivityImpl::get_remaining() const
+{
+  return surf_action_ ? surf_action_->get_remains() : 0;
+}
+
+const char* ActivityImpl::get_state_str() const
+{
+  return to_c_str(state_);
+}
+
+bool ActivityImpl::test()
+{
+  if (state_ != State::WAITING && state_ != State::RUNNING) {
+    finish();
+    return true;
+  }
+  return false;
+}
+
+void ActivityImpl::wait_for(actor::ActorImpl* issuer, double timeout)
+{
+  XBT_DEBUG("Wait for execution of synchro %p, state %s", this, to_c_str(state_));
+  xbt_assert(std::isfinite(timeout), "timeout is not finite!");
+
+  /* Associate this simcall to the synchro */
+  register_simcall(&issuer->simcall_);
+
+  xbt_assert(not MC_is_active() && not MC_record_replay_is_active(), "MC is currently not supported here.");
+
+  /* If the synchro is already finished then perform the error handling */
+  if (state_ != State::RUNNING) {
+    finish();
+  } else {
+    /* we need a sleep action (even when the timeout is infinite) to be notified of host failures */
+    RawImplPtr synchro(new RawImpl([this, issuer]() {
+      this->unregister_simcall(&issuer->simcall_);
+      issuer->waiting_synchro_ = nullptr;
+      auto* observer = dynamic_cast<kernel::actor::ActivityWaitSimcall*>(issuer->simcall_.observer_);
+      xbt_assert(observer != nullptr);
+      observer->set_result(true);
+    }));
+    synchro->set_host(issuer->get_host()).set_timeout(timeout).start();
+    synchro->register_simcall(&issuer->simcall_);
+  }
+}
+
 void ActivityImpl::suspend()
 {
   if (surf_action_ == nullptr)
@@ -38,13 +110,21 @@ void ActivityImpl::resume()
   on_resumed(*this);
 }
 
+void ActivityImpl::cancel()
+{
+  XBT_VERB("Activity %p is canceled", this);
+  if (surf_action_ != nullptr)
+    surf_action_->cancel();
+  state_ = State::CANCELED;
+}
+
 // boost::intrusive_ptr<Activity> support:
-void intrusive_ptr_add_ref(simgrid::kernel::activity::ActivityImpl* activity)
+void intrusive_ptr_add_ref(ActivityImpl* activity)
 {
   activity->refcount_.fetch_add(1, std::memory_order_relaxed);
 }
 
-void intrusive_ptr_release(simgrid::kernel::activity::ActivityImpl* activity)
+void intrusive_ptr_release(ActivityImpl* activity)
 {
   if (activity->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
     std::atomic_thread_fence(std::memory_order_acquire);