trim instr_msg code

diff --git a/src/msg/instr_msg_task.cpp b/src/msg/instr_msg_task.cpp
index 5a5df88..90fa914 100644 (file)
--- a/src/msg/instr_msg_task.cpp
+++ b/src/msg/instr_msg_task.cpp
@@ -12,35 +12,6 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_msg, instr, "MSG instrumentation");
 
 
 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_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()));
-
-    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)
 {
 /* MSG_task_put related functions */
 void TRACE_msg_task_put_start(msg_task_t task)
 {

diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp
index b81c975..5aa7a6f 100644 (file)
--- a/src/msg/msg_gos.cpp
+++ b/src/msg/msg_gos.cpp
@@ -268,8 +268,11 @@ msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, d
       throw;
   }
 
       throw;
   }
 

-  if (ret != MSG_HOST_FAILURE && ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) {
-    TRACE_msg_task_get_end(*task);
+  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);
+    simgrid::instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->end_event(process_container, "SR", key);

   }
   return ret;
 }
   }
   return ret;
 }


@@ -817,7 +820,18 @@ int MSG_task_listen_from(const char *alias)
  */
 void MSG_task_set_category (msg_task_t task, const char *category)
 {
  */
 void MSG_task_set_category (msg_task_t task, const char *category)
 {

-  TRACE_msg_set_task_category (task, 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);
+  }

 }
 
 /**
 }
 
 /**

diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp
index e12dacb..63a3a42 100644 (file)
--- a/src/msg/msg_private.hpp
+++ b/src/msg/msg_private.hpp
@@ -83,8 +83,6 @@ XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(simgrid::kernel::activity::CommIm
 
 /********** Tracing **********/
 /* declaration of instrumentation functions from msg_task_instr.c */
 
 /********** 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);
 
 
 XBT_PRIVATE void TRACE_msg_task_put_start(msg_task_t task);