X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4bb73cb3914b5f7b77a9ec1f8abe728e637cc016..a47e722190af3bc98a0d5bd16807cb3939f6e4af:/include/simgrid/s4u/Exec.hpp

diff --git a/include/simgrid/s4u/Exec.hpp b/include/simgrid/s4u/Exec.hpp
index 9566d53c85..18f00283e9 100644
--- a/include/simgrid/s4u/Exec.hpp
+++ b/include/simgrid/s4u/Exec.hpp
@@ -8,15 +8,18 @@
 
 #include <simgrid/forward.h>
 #include <simgrid/s4u/Activity.hpp>
-#include <simgrid/s4u/forward.hpp>
 
 #include <atomic>
 
 namespace simgrid {
 namespace s4u {
 
-XBT_PUBLIC_CLASS Exec : public Activity
-{
+/** Computation #Activity, representing the asynchronous disk access.
+ *
+ * They are generated from simgrid::s4u::this_actor::exec_init() or simgrid::s4u::Host::execute().
+ */
+
+class XBT_PUBLIC Exec : public Activity {
   Exec() : Activity() {}
 public:
   friend XBT_PUBLIC void intrusive_ptr_release(simgrid::s4u::Exec * e);
@@ -25,24 +28,48 @@ public:
 
   ~Exec() = default;
 
+  static simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> on_start;
+  static simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> on_completion;
+
   Activity* start() override;
   Activity* wait() override;
-  Activity* wait(double timeout) override;
-  bool test();
+  Activity* wait_for(double timeout) override;
+  Activity* cancel() override;
+  bool test() override;
+
+  ExecPtr set_priority(double priority);
+  ExecPtr set_bound(double bound);
+  ExecPtr set_host(Host* host);
+  ExecPtr set_name(std::string name);
+  ExecPtr set_tracing_category(std::string category);
+  Host* get_host();
 
-  ExecPtr setPriority(double priority);
-  ExecPtr setBound(double bound);
-  ExecPtr setHost(Host * host);
-  Host* getHost() { return host_; }
+  double get_remaining() override;
+  double get_remaining_ratio();
 
-  double getRemains() override;
-  double getRemainingRatio();
+#ifndef DOXYGEN
+  //////////////// Deprecated functions
+  XBT_ATTRIB_DEPRECATED_v324("Please use Exec::wait_for()") void wait(double t) override { wait_for(t); }
+  XBT_ATTRIB_DEPRECATED_v323("Please use Exec::set_priority()") ExecPtr setPriority(double priority)
+  {
+    return set_priority(priority);
+  }
+  XBT_ATTRIB_DEPRECATED_v323("Please use Exec::set_bound()") ExecPtr setBound(double bound) { return set_bound(bound); }
+  XBT_ATTRIB_DEPRECATED_v323("Please use Exec::set_host()") ExecPtr setHost(Host* host) { return set_host(host); }
+  XBT_ATTRIB_DEPRECATED_v323("Please use Exec::get_host()") Host* getHost() { return get_host(); }
+  XBT_ATTRIB_DEPRECATED_v323("Please use Exec::get_remaining_ratio()") double getRemainingRatio()
+  {
+    return get_remaining_ratio();
+  }
+#endif
 
 private:
-  Host* host_          = nullptr;
-  double flops_amount_ = 0.0;
-  double priority_     = 1.0;
-  double bound_        = 0.0;
+  Host* host_                   = nullptr;
+  double flops_amount_          = 0.0;
+  double priority_              = 1.0;
+  double bound_                 = 0.0;
+  std::string name_             = "";
+  std::string tracing_category_ = "";
   std::atomic_int_fast32_t refcount_{0};
 }; // class
 }