X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c2ee13e39edc041a79cce8d08fd58d0d45c3502b..48d16e98696450e0dc1ae85cfb8f84b41d15b409:/src/msg/msg_private.hpp

diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp
index 01ec91afd3..3dbb000138 100644
--- a/src/msg/msg_private.hpp
+++ b/src/msg/msg_private.hpp
@@ -6,10 +6,12 @@
 #ifndef MSG_PRIVATE_HPP
 #define MSG_PRIVATE_HPP
 
+#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>
 
 /**************** datatypes **********************************/
 namespace simgrid {
@@ -17,49 +19,76 @@ namespace msg {
 class Task {
   std::string name_             = "";
   std::string tracing_category_ = "";
+  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);
+
+  void report_multiple_use() const;
 
 public:
-  ~Task();
-  explicit Task(std::string name, double flops_amount, double bytes_amount)
-      : name_(std::move(name)), flops_amount(flops_amount), bytes_amount(bytes_amount)
-  {
-  }
-  void set_used();
-  void set_not_used() { this->is_used = false; }
+  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,
+                               double* bytes_amount, void* data);
+  msg_error_t execute();
+  msg_error_t send(std::string alias, double timeout);
+  s4u::CommPtr send_async(std::string alias, void_f_pvoid_t cleanup, bool detached);
+
+  void cancel();
 
+  Task(const Task&) = delete;
+  Task& operator=(const Task&) = delete;
+  ~Task()                      = default;
+
+  bool is_used() { return is_used_; }
+  bool is_parallel() { return parallel_; }
+
+  void set_used();
+  void set_not_used() { this->is_used_ = false; }
   const std::string& get_name() const { return name_; }
   const char* get_cname() { return name_.c_str(); }
   void set_name(const char* new_name) { name_ = std::string(new_name); }
   void set_tracing_category(const char* category) { tracing_category_ = category ? std::string(category) : ""; }
   const std::string& get_tracing_category() { return tracing_category_; }
   bool has_tracing_category() { return not tracing_category_.empty(); }
+  void* get_user_data() { return userdata_; }
+  void set_user_data(void* data) { userdata_ = data; }
+  long long int get_id() { return id_; }
+  double get_priority() { return priority_; }
+  void set_priority(double priority);
+  void set_bound(double bound) { bound_ = bound; }
+  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();
+
+  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 */
 
-  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 */
-  msg_process_t sender                           = nullptr;
-  msg_process_t receiver                         = nullptr;
-
-  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 */
-  int host_nb = 0;     /* ==0 if sequential task; parallel task if not */
   /*******  Parallel Tasks Only !!!! *******/
-  sg_host_t* host_list          = nullptr;
-  double* flops_parallel_amount = nullptr;
-  double* bytes_parallel_amount = nullptr;
-
-private:
-  void report_multiple_use() const;
+  bool parallel_ = false;
+  std::vector<s4u::Host*> hosts_;
+  std::vector<double> flops_parallel_amount;
+  std::vector<double> bytes_parallel_amount;
 };
 
 class Comm {
 public:
-  msg_task_t task_sent;        /* task sent (NULL for the receiver) */
-  msg_task_t* task_received;   /* where the task will be received (NULL for the sender) */
+  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)
@@ -85,9 +114,4 @@ XBT_PUBLIC_DATA MSG_Global_t msg_global;
 /*************************************************************/
 XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size);
 
-/********** Tracing **********/
-/* declaration of instrumentation functions from msg_task_instr.c */
-XBT_PRIVATE void TRACE_msg_task_put_start(msg_task_t task);
-
-
 #endif