X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4baeceb26e6cfc594ba0bd184ee0a755e47a2a85..40596ee56b58bbf297c5251b39cef61348da677f:/src/s4u/s4u_Activity.cpp

diff --git a/src/s4u/s4u_Activity.cpp b/src/s4u/s4u_Activity.cpp
index 000e1b5a3c..e06fb23233 100644
--- a/src/s4u/s4u_Activity.cpp
+++ b/src/s4u/s4u_Activity.cpp
@@ -10,6 +10,7 @@
 #include <simgrid/s4u/Io.hpp>
 #include <xbt/log.h>
 
+#include "src/kernel/activity/ActivityImpl.hpp"
 #include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/actor/SimcallObserver.hpp"
 
@@ -20,6 +21,20 @@ 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::destroy()
+{
+  /* First Remove all dependencies */
+  while (not dependencies_.empty())
+    (*(dependencies_.begin()))->remove_successor(this);
+  while (not successors_.empty())
+    this->remove_successor(successors_.front());
+
+  cancel();
+}
 
 void Activity::wait_until(double time_limit)
 {
@@ -72,7 +87,8 @@ Activity* Activity::cancel()
 {
   kernel::actor::simcall([this] {
     XBT_HERE();
-    pimpl_->cancel();
+    if (pimpl_)
+      pimpl_->cancel();
   });
   complete(State::CANCELED);
   return this;
@@ -113,10 +129,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;
 }