X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9fa9572196b757abc91da3aa0ac318614f390827..cc320f970d3f91bf9483f44340078c0250a4a44b:/src/s4u/s4u_Activity.cpp

diff --git a/src/s4u/s4u_Activity.cpp b/src/s4u/s4u_Activity.cpp
index a174119b82..8c22f5871e 100644
--- a/src/s4u/s4u_Activity.cpp
+++ b/src/s4u/s4u_Activity.cpp
@@ -3,11 +3,13 @@
 /* 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 "xbt/log.h"
+#include <simgrid/Exception.hpp>
+#include <simgrid/s4u/Activity.hpp>
+#include <simgrid/s4u/Engine.hpp>
+#include <simgrid/s4u/Exec.hpp>
+#include <simgrid/s4u/Io.hpp>
+#include <xbt/log.h>
 
-#include "simgrid/Exception.hpp"
-#include "simgrid/s4u/Activity.hpp"
-#include "simgrid/s4u/Engine.hpp"
 #include "src/kernel/activity/ActivityImpl.hpp"
 #include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/actor/SimcallObserver.hpp"
@@ -18,6 +20,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_activity, s4u, "S4U activities");
 namespace simgrid {
 namespace s4u {
 
+xbt::signal<void(Activity&)> Activity::on_veto;
+xbt::signal<void(Activity&)> Activity::on_completion;
+
+std::set<Activity*>* Activity::vetoed_activities_ = nullptr;
+
 void Activity::wait_until(double time_limit)
 {
   double now = Engine::get_clock();
@@ -30,6 +37,13 @@ Activity* Activity::wait_for(double timeout)
   if (state_ == State::INITED)
     vetoable_start();
 
+  if (state_ == State::FAILED) {
+    if (dynamic_cast<Exec*>(this))
+      throw HostFailureException(XBT_THROW_POINT, "Cannot wait for a failed exec");
+    if (dynamic_cast<Io*>(this))
+      throw StorageFailureException(XBT_THROW_POINT, "Cannot wait for a failed I/O");
+  }
+
   kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
   kernel::actor::ActivityWaitSimcall observer{issuer, pimpl_.get(), timeout};
   if (kernel::actor::simcall_blocking(
@@ -103,10 +117,19 @@ double Activity::get_remaining() const
   else
     return pimpl_->get_remaining();
 }
+double Activity::get_start_time() const
+{
+  return pimpl_->get_start_time();
+}
+double Activity::get_finish_time() const
+{
+  return pimpl_->get_finish_time();
+}
 
 Activity* Activity::set_remaining(double remains)
 {
-  xbt_assert(state_ == State::INITED, "Cannot change the remaining amount of work once the Activity is started");
+  xbt_assert(state_ == State::INITED || state_ == State::STARTING,
+             "Cannot change the remaining amount of work once the Activity is started");
   remains_ = remains;
   return this;
 }