objectify simdata_task_t

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

diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp
index e12dacb..847d595 100644 (file)
--- a/src/msg/msg_private.hpp
+++ b/src/msg/msg_private.hpp
@@ -12,32 +12,27 @@
 #include "src/kernel/activity/ExecImpl.hpp"
 
 /**************** datatypes **********************************/
-/********************************* Task **************************************/
-
-struct s_simdata_task_t {
-  ~s_simdata_task_t()
-  {
-    /* parallel tasks only */
-    delete[] host_list;
-    delete[] flops_parallel_amount;
-    delete[] bytes_parallel_amount;
-  }
-  void setUsed();
-  void setNotUsed() { this->isused = false; }
+namespace simgrid {
+namespace msg {
+class Task {
+public:
+  ~Task();
+  explicit Task(double flops_amount, double bytes_amount) : flops_amount(flops_amount), bytes_amount(bytes_amount) {}
+  void set_used();
+  void set_not_used() { this->is_used = 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 */
+  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 +40,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 +54,9 @@ public:
   {
   }
 };
-}
-}
+
+} // namespace msg
+} // namespace simgrid
 
 /************************** Global variables ********************************/
 struct s_MSG_Global_t {
@@ -83,16 +74,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