implement s4u::Exec->getRemainingRatio()

[simgrid.git] / include / simgrid / s4u / Exec.hpp

diff --git a/include/simgrid/s4u/Exec.hpp b/include/simgrid/s4u/Exec.hpp
index 7a93855..5db4722 100644 (file)
--- a/include/simgrid/s4u/Exec.hpp
+++ b/include/simgrid/s4u/Exec.hpp
@@ -6,10 +6,12 @@
 #ifndef SIMGRID_S4U_EXEC_HPP
 #define SIMGRID_S4U_EXEC_HPP
 
-#include "src/kernel/activity/ExecImpl.hpp"
 #include <simgrid/forward.h>
+#include <simgrid/s4u/Activity.hpp>
 #include <simgrid/s4u/forward.hpp>
 
+#include <atomic>
+
 namespace simgrid {
 namespace s4u {
 
@@ -17,39 +19,26 @@ XBT_PUBLIC_CLASS Exec : public Activity
 {
   Exec() : Activity() {}
 public:
-  friend void intrusive_ptr_release(simgrid::s4u::Exec * e)
-  {
-    if (e->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
-      std::atomic_thread_fence(std::memory_order_acquire);
-      delete e;
-    }
-  }
-
-  friend void intrusive_ptr_add_ref(simgrid::s4u::Exec * e) { e->refcount_.fetch_add(1, std::memory_order_relaxed); }
-
+  friend void intrusive_ptr_release(simgrid::s4u::Exec * e);
+  friend void intrusive_ptr_add_ref(simgrid::s4u::Exec * e);
   friend Actor; // Factory of Exec
 
   ~Exec() = default;
 
-  void start()
-  {
-    pimpl_ = simcall_execution_start(nullptr, flops_amount_, 1 / priority_, 0.);
-    state_ = started;
-  }
-  void wait() override { this->wait(-1); }
-  void wait(double timeout) override { simcall_execution_wait(pimpl_); }
+  void start() override;
+  void wait() override;
+  void wait(double timeout) override;
+  bool test();
+
+  ExecPtr setPriority(double priority);
 
-  double getRemains()
-  {
-    return simgrid::simix::kernelImmediate(
-        [this]() { return boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(pimpl_)->remains(); });
-  }
+  double getRemains() override;
+  double getRemainingRatio();
 
 private:
   smx_actor_t runner_  = nullptr;
   double flops_amount_ = 0.0;
   double priority_     = 1.0;
-  double bound_        = 0.0;
 
   std::atomic_int_fast32_t refcount_{0};
 }; // class