[mc] Replace the override word with MC_OVERRIDE

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

diff --git a/src/msg/instr_msg_task.c b/src/msg/instr_msg_task.c
index 52acde4..cc98733 100644 (file)
--- a/src/msg/instr_msg_task.c
+++ b/src/msg/instr_msg_task.c
@@ -1,17 +1,13 @@
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "instr/instr_private.h"
 #include "msg_private.h"
-#include "msg/datatypes.h"
 #include "mc/mc.h"
 
-
-#ifdef HAVE_TRACING
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg, instr, "MSG");
 
 void TRACE_msg_set_task_category(msg_task_t task, const char *category)
@@ -39,10 +35,8 @@ void TRACE_msg_task_create(msg_task_t task)
   task->counter = counter++;
   task->category = NULL;
   
-  if(MC_is_active()){
-    MC_ignore_data_bss(&counter, sizeof(counter));
+  if(MC_is_active())
     MC_ignore_heap(&(task->counter), sizeof(task->counter));
-  }
 
   XBT_DEBUG("CREATE %p, %lld", task, task->counter);
 }
@@ -159,5 +153,3 @@ void TRACE_msg_task_put_end(void)
     new_pajePopState (MSG_get_clock(), process_container, type);
   }
 }
-
-#endif /* HAVE_TRACING */