Factor Activity::cancel() through CRTP.

[simgrid.git] / src / s4u / s4u_Activity.cpp

diff --git a/src/s4u/s4u_Activity.cpp b/src/s4u/s4u_Activity.cpp
index 4c004d5..00b3ff4 100644 (file)
--- a/src/s4u/s4u_Activity.cpp
+++ b/src/s4u/s4u_Activity.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-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. */
@@ -7,6 +7,8 @@
 
 #include "simgrid/s4u/Activity.hpp"
 #include "simgrid/s4u/Engine.hpp"
+#include "src/kernel/activity/ActivityImpl.hpp"
+
 XBT_LOG_EXTERNAL_CATEGORY(s4u);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_activity, s4u, "S4U activities");
 
@@ -20,9 +22,66 @@ void Activity::wait_until(double time_limit)
     wait_for(time_limit - now);
 }
 
-double Activity::get_remaining()
+bool Activity::test()
+{
+  xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::STARTING ||
+             state_ == State::CANCELED || state_ == State::FINISHED);
+
+  if (state_ == State::CANCELED || state_ == State::FINISHED)
+    return true;
+
+  if (state_ == State::INITED || state_ == State::STARTING)
+    this->vetoable_start();
+
+  if (kernel::actor::simcall([this] { return this->get_impl()->test(); })) {
+    complete(State::FINISHED);
+    return true;
+  }
+
+  return false;
+}
+
+Activity* Activity::cancel()
+{
+  kernel::actor::simcall([this] { pimpl_->cancel(); });
+  complete(State::CANCELED);
+  return this;
+}
+
+Activity* Activity::suspend()
+{
+  if (suspended_)
+    return this; // Already suspended
+  suspended_ = true;
+
+  if (state_ == State::STARTED)
+    pimpl_->suspend();
+
+  return this;
+}
+
+Activity* Activity::resume()
+{
+  if (not suspended_)
+    return this; // nothing to restore when it's not suspended
+
+  if (state_ == State::STARTED)
+    pimpl_->resume();
+
+  return this;
+}
+
+const char* Activity::get_state_str() const
+{
+  return to_c_str(state_);
+}
+
+double Activity::get_remaining() const
 {
-  return remains_;
+  if (state_ == State::INITED || state_ == State::STARTING)
+    return remains_;
+  else
+    return pimpl_->get_remaining();
 }
 
 Activity* Activity::set_remaining(double remains)