Remove deprecated features for next release (3.29).

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

diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp
index 5a7e590..067fdd7 100644 (file)
--- a/include/simgrid/s4u/Actor.hpp
+++ b/include/simgrid/s4u/Actor.hpp
@@ -24,7 +24,7 @@ namespace s4u {
 
 /** An actor is an independent stream of execution in your distributed application.
  *
- * \rst
+ * @beginrst
  * It is located on a (simulated) :cpp:class:`host <simgrid::s4u::Host>`, but can interact
  * with the whole simulated platform.
  *
@@ -37,7 +37,8 @@ namespace s4u {
  * The `documentation of this standard <http://en.cppreference.com/w/cpp/thread>`_
  * may help to understand the philosophy of the SimGrid actors.
  *
- * \endrst */
+ * @endrst
+ */
 class XBT_PUBLIC Actor : public xbt::Extendable<Actor> {
 #ifndef DOXYGEN
   friend Exec;
@@ -79,10 +80,6 @@ public:
   static xbt::signal<void(Actor const&)> on_wake_up;
   /** Signal to others that an actor is has been migrated to another host **/
   static xbt::signal<void(const Actor&, const Host& previous_location)> on_host_change;
-#ifndef DOXYGEN
-  static xbt::signal<void(Actor const&)> on_migration_start; // XBT_ATTRIB_DEPRECATED_v329
-  static xbt::signal<void(Actor const&)> on_migration_end;   // XBT_ATTRIB_DEPRECATED_v329
-#endif
 
   /** Signal indicating that an actor terminated its code.
    *  @beginrst
@@ -109,6 +106,21 @@ public:
   /** Start a previously initialized actor */
   ActorPtr start(const std::function<void()>& code);
 
+  template <class F> ActorPtr start(F code) { return start(std::function<void()>(std::move(code))); }
+
+  template <class F, class... Args,
+  // This constructor is enabled only if the call code(args...) is valid:
+#ifndef DOXYGEN /* breathe seem to choke on function signatures in template parameter, see breathe#611 */
+            typename = typename std::result_of_t<F(Args...)>
+#endif
+            >
+  ActorPtr start(F code, Args... args)
+  {
+    return start(std::bind(std::move(code), std::move(args)...));
+  }
+
+  ActorPtr start(const std::function<void()>& code, std::vector<std::string> args);
+
   /** Create an actor from a callable thing. */
   template <class F> static ActorPtr create(const std::string& name, s4u::Host* host, F code)
   {
@@ -192,9 +204,6 @@ public:
    * to take care of this yourself (only you knows which ones should be migrated).
    */
   void set_host(Host* new_host);
-#ifndef DOXYGEN
-  XBT_ATTRIB_DEPRECATED_v329("Please use set_host() instead") void migrate(Host* new_host) { set_host(new_host); }
-#endif
 
   /** Ask the actor to die.
    *
@@ -275,7 +284,7 @@ XBT_PUBLIC void execute(double flop, double priority);
 
 /** Block the current actor until the built parallel execution terminates
  *
- * \rst
+ * @beginrst
  * .. _API_s4u_parallel_execute:
  *
  * **Example of use:** `examples/cpp/exec-ptask/s4u-exec-ptask.cpp
@@ -322,16 +331,12 @@ XBT_PUBLIC void execute(double flop, double priority);
  * models, and you must :ref:`use the ptask_L07 host model <options_model_select>` for that. Note that you can mix
  * regular executions and communications with parallel executions, provided that the host model is ptask_L07.
  *
- * \endrst
+ * @endrst
  */
 /** Block the current actor until the built parallel execution completes */
 XBT_PUBLIC void parallel_execute(const std::vector<s4u::Host*>& hosts, const std::vector<double>& flops_amounts,
                                  const std::vector<double>& bytes_amounts);
 
-XBT_ATTRIB_DEPRECATED_v329("Please use exec_init(...)->wait_for(timeout)") XBT_PUBLIC
-    void parallel_execute(const std::vector<s4u::Host*>& hosts, const std::vector<double>& flops_amounts,
-                          const std::vector<double>& bytes_amounts, double timeout);
-
 /** Initialize a sequential execution that must then be started manually */
 XBT_PUBLIC ExecPtr exec_init(double flops_amounts);
 /** Initialize a parallel execution that must then be started manually */
@@ -381,9 +386,6 @@ XBT_PUBLIC void on_exit(const std::function<void(bool)>& fun);
 
 /** @brief Migrate the current actor to a new host. */
 XBT_PUBLIC void set_host(Host* new_host);
-#ifndef DOXYGEN
-XBT_ATTRIB_DEPRECATED_v329("Please use set_host() instead") XBT_PUBLIC void migrate(Host* new_host);
-#endif
 }