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

diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp
index 4905c672f1..01ec91afd3 100644
--- a/src/msg/msg_private.hpp
+++ b/src/msg/msg_private.hpp
@@ -12,31 +12,40 @@
 #include "src/kernel/activity/ExecImpl.hpp"
 
 /**************** datatypes **********************************/
-/********************************* Task **************************************/
+namespace simgrid {
+namespace msg {
+class Task {
+  std::string name_             = "";
+  std::string tracing_category_ = "";
 
-struct s_simdata_task_t {
-  ~s_simdata_task_t()
+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)
   {
-    /* parallel tasks only */
-    delete[] this->host_list;
-    /* flops_parallel_amount and bytes_parallel_amount are automatically deleted in ~L07Action */
   }
-  void setUsed();
-  void setNotUsed() { this->isused = false; }
-
-  simgrid::kernel::activity::ExecImplPtr compute = nullptr; /* SIMIX modeling of computation */
-  simgrid::kernel::activity::CommImplPtr comm    = nullptr; /* SIMIX modeling of communication */
-  double bytes_amount                            = 0.0;     /* Data size */
+  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(); }
+
+  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;
-  msg_host_t source                              = 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 isused = false; /* Indicates whether the task is used in SIMIX currently */
+  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;
@@ -44,27 +53,23 @@ struct s_simdata_task_t {
   double* bytes_parallel_amount = nullptr;
 
 private:
-  void reportMultipleUse() const;
+  void report_multiple_use() const;
 };
 
-/******************************* Process *************************************/
-
-namespace simgrid {
-namespace msg {
-
 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) */
-  smx_activity_t s_comm;       /* SIMIX communication object encapsulated (the same for both processes) */
+  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, smx_activity_t comm)
+  Comm(msg_task_t sent, msg_task_t* received, s4u::CommPtr comm)
       : task_sent(sent), task_received(received), s_comm(std::move(comm))
   {
   }
 };
-}
-}
+
+} // namespace msg
+} // namespace simgrid
 
 /************************** Global variables ********************************/
 struct s_MSG_Global_t {
@@ -78,26 +83,11 @@ typedef s_MSG_Global_t* MSG_Global_t;
 XBT_PUBLIC_DATA MSG_Global_t msg_global;
 
 /*************************************************************/
-XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(smx_activity_t comm, void* buff, size_t buff_size);
+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_set_task_category(msg_task_t task, const char* category);
-XBT_PRIVATE void TRACE_msg_task_create(msg_task_t task);
-XBT_PRIVATE void TRACE_msg_task_execute_start(msg_task_t task);
-XBT_PRIVATE void TRACE_msg_task_execute_end(msg_task_t task);
-XBT_PRIVATE void TRACE_msg_task_destroy(msg_task_t task);
-XBT_PRIVATE void TRACE_msg_task_get_end(msg_task_t task);
-XBT_PRIVATE void TRACE_msg_task_get_start();
 XBT_PRIVATE void TRACE_msg_task_put_start(msg_task_t task);
-XBT_PRIVATE void TRACE_msg_task_put_end();
-
 
-inline void s_simdata_task_t::setUsed()
-{
-  if (this->isused)
-    this->reportMultipleUse();
-  this->isused = true;
-}
 
 #endif