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

[simgrid.git] / src / msg / instr_msg_task.cpp

diff --git a/src/msg/instr_msg_task.cpp b/src/msg/instr_msg_task.cpp
index ef23c1c..bd2a503 100644 (file)
--- a/src/msg/instr_msg_task.cpp
+++ b/src/msg/instr_msg_task.cpp
@@ -12,48 +12,10 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_msg, instr, "MSG instrumentation");
 
-void TRACE_msg_set_task_category(msg_task_t task, const char *category)
-{
-  xbt_assert(task->category == nullptr, "Task %p(%s) already has a category (%s).",
-      task, task->name, task->category);
-
-  //if user provides a nullptr category, task is no longer traced
-  if (category == nullptr) {
-    xbt_free (task->category);
-    task->category = nullptr;
-    XBT_DEBUG("MSG task %p(%s), category removed", task, task->name);
-  } else {
-    // set task category
-    task->category = xbt_strdup(category);
-    XBT_DEBUG("MSG task %p(%s), category %s", task, task->name, task->category);
-  }
-}
-
-void TRACE_msg_task_get_start()
-{
-  XBT_DEBUG("GET,in");
-
-  if (TRACE_actor_is_enabled())
-    simgrid::instr::Container::by_name(instr_pid(MSG_process_self()))->get_state("ACTOR_STATE")->push_event("receive");
-}
-
-void TRACE_msg_task_get_end(msg_task_t task)
-{
-  XBT_DEBUG("GET,out %p, %lld, %s", task, task->counter, task->category);
-
-  if (TRACE_actor_is_enabled()) {
-    container_t process_container = simgrid::instr::Container::by_name(instr_pid(MSG_process_self()));
-    process_container->get_state("ACTOR_STATE")->pop_event();
-
-    std::string key = std::string("p") + std::to_string(task->counter);
-    simgrid::instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->end_event(process_container, "SR", key);
-  }
-}
-
 /* 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->category);
+  XBT_DEBUG("PUT,in %p, %lld, %s", task, task->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()));
@@ -61,11 +23,3 @@ void TRACE_msg_task_put_start(msg_task_t task)
     simgrid::instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->start_event(process_container, "SR", key);
   }
 }
-
-void TRACE_msg_task_put_end()
-{
-  XBT_DEBUG("PUT,out");
-
-  if (TRACE_actor_is_enabled())
-    simgrid::instr::Container::by_name(instr_pid(MSG_process_self()))->get_state("ACTOR_STATE")->pop_event();
-}