X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6a8d5cf4199454b5f811043c207d195107743e72..fbcf6ab31cae1988be858f9f894dafe529c575d7:/include/simgrid/s4u/Exec.hpp

diff --git a/include/simgrid/s4u/Exec.hpp b/include/simgrid/s4u/Exec.hpp
index b47ac41e9e..ecfa6cec59 100644
--- a/include/simgrid/s4u/Exec.hpp
+++ b/include/simgrid/s4u/Exec.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2017-2019. 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. */
@@ -8,65 +8,100 @@
 
 #include <simgrid/forward.h>
 #include <simgrid/s4u/Activity.hpp>
+#include <xbt/ex.h>
 
 #include <atomic>
 
 namespace simgrid {
 namespace s4u {
 
+/** Computation Activity, representing the asynchronous executions.
+ *
+ * They are generated from this_actor::exec_init() or Host::execute(), and can be used to model pools of threads or
+ * similar mechanisms.
+ */
 class XBT_PUBLIC Exec : public Activity {
-  Exec() : Activity() {}
+  std::string name_             = "";
+  double priority_              = 1.0;
+  double bound_                 = 0.0;
+  double timeout_               = 0.0;
+  std::string tracing_category_ = "";
+  std::atomic_int_fast32_t refcount_{0};
+  Host* host_ = nullptr;
+
+protected:
+  Exec();
+  virtual ~Exec() = default;
+
 public:
-  friend XBT_PUBLIC void intrusive_ptr_release(simgrid::s4u::Exec * e);
-  friend XBT_PUBLIC void intrusive_ptr_add_ref(simgrid::s4u::Exec * e);
-  friend XBT_PUBLIC ExecPtr this_actor::exec_init(double flops_amount);
+#ifndef DOXYGEN
+  Exec(Exec const&) = delete;
+  Exec& operator=(Exec const&) = delete;
 
-  ~Exec() = default;
+  friend ExecSeq;
+  friend ExecPar;
+  friend XBT_PUBLIC void intrusive_ptr_release(Exec* e);
+  friend XBT_PUBLIC void intrusive_ptr_add_ref(Exec* e);
+#endif
+  static xbt::signal<void(Actor const&)> on_start;
+  static xbt::signal<void(Actor const&)> on_completion;
 
-  Activity* start() override;
-  Activity* wait() override;
-  Activity* wait(double timeout) override;
-  Activity* cancel() override;
-  bool test();
+  virtual Exec* start() override          = 0;
+  virtual double get_remaining_ratio()    = 0;
+  virtual ExecPtr set_host(Host* host)    = 0;
+
+  Exec* wait() override;
+  Exec* wait_for(double timeout) 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);
+  ExecPtr set_name(const std::string& name);
+  ExecPtr set_priority(double priority);
+  ExecPtr set_tracing_category(const std::string& category);
+  ExecPtr set_timeout(double timeout);
+  Exec* cancel() override;
+
+  XBT_ATTRIB_DEPRECATED_v324("Please use Exec::wait_for()") void wait(double t) override { wait_for(t); }
+};
+
+class XBT_PUBLIC ExecSeq : public Exec {
+  double flops_amount_ = 0.0;
+
+  explicit ExecSeq(sg_host_t host, double flops_amount);
+
+public:
+  friend XBT_PUBLIC ExecPtr this_actor::exec_init(double flops_amount);
+
+  ~ExecSeq() = default;
+
+  Exec* start() override;
+
+  ExecPtr set_host(Host* host) override;
   Host* get_host();
 
   double get_remaining() override;
-  double get_remaining_ratio();
-
-  //////////////// Deprecated functions
-  /** @deprecated See Exec::set_priority() */
-  XBT_ATTRIB_DEPRECATED_v323("Please use Exec::set_priority()") ExecPtr setPriority(double priority)
-  {
-    return set_priority(priority);
-  }
-  /** @deprecated See Exec::set_bound() */
-  XBT_ATTRIB_DEPRECATED_v323("Please use Exec::set_bound()") ExecPtr setBound(double bound) { return set_bound(bound); }
-  /** @deprecated See Exec::set_host() */
-  XBT_ATTRIB_DEPRECATED_v323("Please use Exec::set_host()") ExecPtr setHost(Host* host) { return set_host(host); }
-  /** @deprecated See Exec::get_host() */
-  XBT_ATTRIB_DEPRECATED_v323("Please use Exec::get_host()") Host* getHost() { return get_host(); }
-  /** @deprecated See Exec::get_remaining_ratio() */
-  XBT_ATTRIB_DEPRECATED_v323("Please use Exec::get_remaining_ratio()") double getRemainingRatio()
-  {
-    return get_remaining_ratio();
-  }
-
-private:
-  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
-}
-}; // Namespace simgrid::s4u
+  double get_remaining_ratio() override;
+};
+
+class XBT_PUBLIC ExecPar : public Exec {
+  std::vector<s4u::Host*> hosts_;
+  std::vector<double> flops_amounts_;
+  std::vector<double> bytes_amounts_;
+  explicit ExecPar(const std::vector<s4u::Host*>& hosts, const std::vector<double>& flops_amounts,
+                   const std::vector<double>& bytes_amounts);
+  ExecPtr set_host(Host* host) override { return this; }
+
+public:
+  ~ExecPar() = default;
+  friend XBT_PUBLIC ExecPtr this_actor::exec_init(const std::vector<s4u::Host*>& hosts,
+                                                  const std::vector<double>& flops_amounts,
+                                                  const std::vector<double>& bytes_amounts);
+  double get_remaining() override;
+  double get_remaining_ratio() override;
+  Exec* start() override;
+};
+
+} // namespace s4u
+} // namespace simgrid
 
 #endif /* SIMGRID_S4U_EXEC_HPP */