mv counter from msg_task_t to simgrid::msg::Task

this was the last field, MSG tasks are now objects
have to remove the useless layer now!

diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index 069282d..f213e6e 100644 (file)
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -241,7 +241,6 @@ typedef sg_msg_Comm* msg_comm_t;
 
 typedef struct msg_task {
   simdata_task_t simdata; /**< @brief simulator data */
-  long long int counter;  /* task unique identifier for instrumentation */
 } s_msg_task_t;
 
 /** @brief Task datatype.

diff --git a/src/msg/instr_msg_task.cpp b/src/msg/instr_msg_task.cpp
index bd2a503..57caf98 100644 (file)
--- a/src/msg/instr_msg_task.cpp
+++ b/src/msg/instr_msg_task.cpp
@@ -15,11 +15,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_msg, instr, "MSG instrumentation");
 /* MSG_task_put related functions */
 void TRACE_msg_task_put_start(msg_task_t task)
 {
-  XBT_DEBUG("PUT,in %p, %lld, %s", task, task->counter, task->simdata->get_tracing_category().c_str());
+  XBT_DEBUG("PUT,in %p, %lld, %s", task, task->simdata->get_counter(), task->simdata->get_tracing_category().c_str());
 
   if (TRACE_actor_is_enabled()) {
     container_t process_container = simgrid::instr::Container::by_name(instr_pid(MSG_process_self()));
-    std::string key = std::string("p") + std::to_string(task->counter);
+    std::string key               = std::string("p") + std::to_string(task->simdata->get_counter());
     simgrid::instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->start_event(process_container, "SR", key);
   }
 }

diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp
index afae6c3..e2b9431 100644 (file)
--- a/src/msg/msg_gos.cpp
+++ b/src/msg/msg_gos.cpp
@@ -270,7 +270,7 @@ msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, d
   if (TRACE_actor_is_enabled() && ret != MSG_HOST_FAILURE && ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) {
     container_t process_container = simgrid::instr::Container::by_name(instr_pid(MSG_process_self()));
 
-    std::string key = std::string("p") + std::to_string((*task)->counter);
+    std::string key = std::string("p") + std::to_string((*task)->simdata->get_counter());
     simgrid::instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->end_event(process_container, "SR", key);
   }
   return ret;

diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp
index 0f2c008..3ad7c43 100644 (file)
--- a/src/msg/msg_private.hpp
+++ b/src/msg/msg_private.hpp
@@ -11,6 +11,8 @@
 #include "src/kernel/activity/CommImpl.hpp"
 #include "src/kernel/activity/ExecImpl.hpp"
 
+static long long int msg_task_max_counter = 0;
+
 /**************** datatypes **********************************/
 namespace simgrid {
 namespace msg {
@@ -18,12 +20,14 @@ class Task {
   std::string name_             = "";
   std::string tracing_category_ = "";
   void* userdata_               = nullptr;
+  long long int counter_;
 
 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)
   {
+    counter_ = msg_task_max_counter++;
   }
   void set_used();
   void set_not_used() { this->is_used = false; }
@@ -36,6 +40,7 @@ public:
   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 */

diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp
index 3f16123..3bfa850 100644 (file)
--- a/src/msg/msg_task.cpp
+++ b/src/msg/msg_task.cpp
@@ -61,17 +61,12 @@ void Task::report_multiple_use() const
  */
 msg_task_t MSG_task_create(const char *name, double flop_amount, double message_size, void *data)
 {
-  static std::atomic_ullong counter{0};
-
   msg_task_t task        = new s_msg_task_t;
   /* Simulator Data */
   task->simdata = new simgrid::msg::Task(name ? name : "", flop_amount, message_size, data);
 
-  /* Task structure */
-  task->counter  = counter++;
-
   if (MC_is_active())
-    MC_ignore_heap(&(task->counter), sizeof(task->counter));
+    MC_ignore_heap(&(task->simdata->get_counter()), sizeof(long long int));
 
   return task;
 }