do not load internal_config.h from mc.h

[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 58aad0b..fb6550f 100644 (file)
--- a/src/msg/instr_msg_task.cpp
+++ b/src/msg/instr_msg_task.cpp
@@ -4,21 +4,22 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "src/instr/instr_private.h"
-#include "msg_private.h"
 #include "mc/mc.h"
+#include "src/instr/instr_private.h"
+#include "src/msg/msg_private.h"
+#include "src/mc/mc_ignore.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg, instr, "MSG");
+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 == NULL, "Task %p(%s) already has a category (%s).",
+  xbt_assert(task->category == nullptr, "Task %p(%s) already has a category (%s).",
       task, task->name, task->category);
 
-  //if user provides a NULL category, task is no longer traced
-  if (category == NULL) {
+  //if user provides a nullptr category, task is no longer traced
+  if (category == nullptr) {
     xbt_free (task->category);
-    task->category = NULL;
+    task->category = nullptr;
     XBT_DEBUG("MSG task %p(%s), category removed", task, task->name);
     return;
   }
@@ -33,7 +34,7 @@ void TRACE_msg_task_create(msg_task_t task)
 {
   static long long counter = 0;
   task->counter = counter++;
-  task->category = NULL;
+  task->category = nullptr;
   
   if(MC_is_active())
     MC_ignore_heap(&(task->counter), sizeof(task->counter));
@@ -78,12 +79,11 @@ void TRACE_msg_task_destroy(msg_task_t task)
 
   //free category
   xbt_free(task->category);
-  task->category = NULL;
-  return;
+  task->category = nullptr;
 }
 
 /* MSG_task_get related functions */
-void TRACE_msg_task_get_start(void)
+void TRACE_msg_task_get_start()
 {
   XBT_DEBUG("GET,in");
 
@@ -140,7 +140,7 @@ int TRACE_msg_task_put_start(msg_task_t task)
   return 1;
 }
 
-void TRACE_msg_task_put_end(void)
+void TRACE_msg_task_put_end()
 {
   XBT_DEBUG("PUT,out");