Merge branch 'master' of https://framagit.org/simgrid/simgrid

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

diff --git a/include/simgrid/s4u/Exec.hpp b/include/simgrid/s4u/Exec.hpp
index 93651fa..ecfa6ce 100644 (file)
--- a/include/simgrid/s4u/Exec.hpp
+++ b/include/simgrid/s4u/Exec.hpp
@@ -37,36 +37,30 @@ public:
 #ifndef DOXYGEN
   Exec(Exec const&) = delete;
   Exec& operator=(Exec const&) = delete;
-#endif
 
-  friend simgrid::s4u::ExecSeq;
-  friend simgrid::s4u::ExecPar;
+  friend ExecSeq;
+  friend ExecPar;
   friend XBT_PUBLIC void intrusive_ptr_release(Exec* e);
   friend XBT_PUBLIC void intrusive_ptr_add_ref(Exec* e);
-  static xbt::signal<void(ActorPtr)> on_start;
-  static xbt::signal<void(ActorPtr)> on_completion;
+#endif
+  static xbt::signal<void(Actor const&)> on_start;
+  static xbt::signal<void(Actor const&)> on_completion;
 
-  virtual double get_remaining()       = 0;
-  virtual double get_remaining_ratio() = 0;
-  virtual Exec* start()                = 0;
-  virtual ExecPtr set_host(Host* host) = 0;
+  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_bound(double bound);
-  ExecPtr set_name(std::string name);
+  ExecPtr set_name(const std::string& name);
   ExecPtr set_priority(double priority);
-  ExecPtr set_tracing_category(std::string category);
+  ExecPtr set_tracing_category(const std::string& category);
   ExecPtr set_timeout(double timeout);
   Exec* cancel() override;
 
-  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_v324("Please use Exec::wait_for()") void wait(double t) override { wait_for(t); }
 };
 
@@ -82,21 +76,11 @@ public:
 
   Exec* start() override;
 
-  ExecPtr set_host(Host* host);
+  ExecPtr set_host(Host* host) override;
   Host* get_host();
 
   double get_remaining() override;
   double get_remaining_ratio() override;
-
-#ifndef DOXYGEN
-  //////////////// Deprecated functions
-  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
 };
 
 class XBT_PUBLIC ExecPar : public Exec {
@@ -105,7 +89,7 @@ class XBT_PUBLIC ExecPar : public Exec {
   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) { return this; }
+  ExecPtr set_host(Host* host) override { return this; }
 
 public:
   ~ExecPar() = default;