cleaning the actor twice seems somewhat overplayed

[simgrid.git] / src / msg / msg_private.hpp

diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp
index a89064b..db817a6 100644 (file)
--- a/src/msg/msg_private.hpp
+++ b/src/msg/msg_private.hpp
@@ -9,7 +9,6 @@
 #include "simgrid/Exception.hpp"
 #include "simgrid/msg.h"
 #include "src/kernel/activity/CommImpl.hpp"
-#include "src/kernel/activity/ExecImpl.hpp"
 #include <simgrid/modelchecker.h>
 
 #include <cmath>
@@ -23,23 +22,26 @@ class Task {
   void* userdata_               = nullptr;
   long long int id_;
 
+  double timeout_  = 0.0;
   double priority_ = 1.0;
   double bound_    = 0.0;   /* Capping for CPU resource, or 0 for no capping */
   double rate_     = -1;    /* Capping for network resource, or -1 for no capping*/
   bool is_used_    = false; /* Indicates whether the task is used in SIMIX currently */
 
-  explicit Task(std::string name, double flops_amount, double bytes_amount, void* data);
-  explicit Task(std::string name, std::vector<s4u::Host*> hosts, std::vector<double> flops_amount,
-                std::vector<double> bytes_amount, void* data);
+  explicit Task(const std::string& name, double flops_amount, double bytes_amount, void* data);
+  explicit Task(const std::string& name, std::vector<s4u::Host*>&& hosts, std::vector<double>&& flops_amount,
+                std::vector<double>&& bytes_amount, void* data);
 
   void report_multiple_use() const;
 
 public:
-  static Task* create(std::string name, double flops_amount, double bytes_amount, void* data);
-  static Task* create_parallel(std::string name, int host_nb, const msg_host_t* host_list, double* flops_amount,
+  static Task* create(const std::string& name, double flops_amount, double bytes_amount, void* data);
+  static Task* create_parallel(const std::string& name, int host_nb, const msg_host_t* host_list, double* flops_amount,
                                double* bytes_amount, void* data);
   msg_error_t execute();
-  s4u::CommPtr send_async(std::string alias, void_f_pvoid_t cleanup, bool detached);
+  msg_error_t send(const std::string& alias, double timeout);
+  s4u::CommPtr send_async(const std::string& alias, void_f_pvoid_t cleanup, bool detached);
+
   void cancel();
 
   Task(const Task&) = delete;
@@ -66,15 +68,15 @@ public:
   double get_bound() { return bound_; }
   void set_rate(double rate) { rate_ = rate; }
   double get_rate() { return rate_; }
+  void set_timeout(double timeout) { timeout_ = timeout; }
 
   s4u::Actor* get_sender();
   s4u::Host* get_source();
 
-  kernel::activity::ExecImplPtr compute          = nullptr; /* SIMIX modeling of computation */
-  s4u::CommPtr comm                              = nullptr; /* S4U modeling of communication */
-  double flops_amount                            = 0.0;     /* Computation size */
-  double bytes_amount                            = 0.0;     /* Data size */
-
+  s4u::ExecPtr compute = nullptr; /* S4U modeling of computation */
+  s4u::CommPtr comm    = nullptr; /* S4U modeling of communication */
+  double flops_amount  = 0.0;     /* Computation size */
+  double bytes_amount  = 0.0;     /* Data size */
 
   /*******  Parallel Tasks Only !!!! *******/
   bool parallel_ = false;
@@ -84,15 +86,29 @@ public:
 };
 
 class Comm {
+  msg_error_t status_ = MSG_OK; /* status of the communication once finished */
 public:
   Task* task_sent;             /* task sent (NULL for the receiver) */
   Task** task_received;        /* where the task will be received (NULL for the sender) */
   s4u::CommPtr s_comm;         /* SIMIX communication object encapsulated (the same for both processes) */
-  msg_error_t status = MSG_OK; /* status of the communication once finished */
   Comm(msg_task_t sent, msg_task_t* received, s4u::CommPtr comm)
       : task_sent(sent), task_received(received), s_comm(std::move(comm))
   {
   }
+  bool test();
+  msg_error_t wait_for(double timeout);
+  void set_status(msg_error_t status) { status_ = status; }
+  msg_error_t get_status() { return status_; }
+};
+
+class ActorUserData {
+  void* userdata_      = nullptr;
+
+public:
+  static xbt::Extension<simgrid::s4u::Actor, ActorUserData> EXTENSION_ID;
+
+  void set_user_data(void* data) { userdata_ = data; }
+  void* get_user_data() { return userdata_; }
 };
 
 } // namespace msg