end objectification of MSG tasks

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

diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp
index e12dacb..14384c6 100644 (file)
--- a/src/msg/msg_private.hpp
+++ b/src/msg/msg_private.hpp
@@ -7,37 +7,55 @@
 #define MSG_PRIVATE_HPP
 
 #include "simgrid/msg.h"
-
 #include "src/kernel/activity/CommImpl.hpp"
 #include "src/kernel/activity/ExecImpl.hpp"
+#include <simgrid/modelchecker.h>
+
+static long long int msg_task_max_counter = 0;
 
 /**************** datatypes **********************************/
-/********************************* Task **************************************/
+namespace simgrid {
+namespace msg {
+class Task {
+  std::string name_             = "";
+  std::string tracing_category_ = "";
+  void* userdata_               = nullptr;
+  long long int counter_;
 
-struct s_simdata_task_t {
-  ~s_simdata_task_t()
+public:
+  ~Task();
+  explicit Task(std::string name, double flops_amount, double bytes_amount, void* data)
+      : name_(std::move(name)), userdata_(data), flops_amount(flops_amount), bytes_amount(bytes_amount)
   {
-    /* parallel tasks only */
-    delete[] host_list;
-    delete[] flops_parallel_amount;
-    delete[] bytes_parallel_amount;
+    counter_ = msg_task_max_counter++;
+    if (MC_is_active())
+      MC_ignore_heap(&(counter_), sizeof(long long int));
   }
-  void setUsed();
-  void setNotUsed() { this->isused = false; }
-
-  simgrid::kernel::activity::ExecImplPtr compute = nullptr; /* SIMIX modeling of computation */
-  simgrid::s4u::CommPtr comm                     = nullptr; /* S4U 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(); }
+  void* get_user_data() { return userdata_; }
+  void set_user_data(void* data) { userdata_ = data; }
+  long long int get_counter() { return counter_; }
+
+  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;
@@ -45,14 +63,9 @@ 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) */
@@ -64,8 +77,9 @@ public:
   {
   }
 };
-}
-}
+
+} // namespace msg
+} // namespace simgrid
 
 /************************** Global variables ********************************/
 struct s_MSG_Global_t {
@@ -83,16 +97,7 @@ XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(simgrid::kernel::activity::CommIm
 
 /********** 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_get_end(msg_task_t task);
 XBT_PRIVATE void TRACE_msg_task_put_start(msg_task_t task);
 
 
-inline void s_simdata_task_t::setUsed()
-{
-  if (this->isused)
-    this->reportMultipleUse();
-  this->isused = true;
-}
-
 #endif