From: schnorr <schnorr@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 4 Feb 2011 14:09:33 +0000 (+0000)
Subject: [trace] cleaner instrumentation
X-Git-Tag: v3.6_beta2~352
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0c539f5e2d25206246bb12e6dc036b108ea778e5?hp=50e830ca114d788e390c130af09e00b66877784c

[trace] cleaner instrumentation

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9577 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/msg/msg_mailbox.c b/src/msg/msg_mailbox.c
index 194c133aea..97af3a11d4 100644
--- a/src/msg/msg_mailbox.c
+++ b/src/msg/msg_mailbox.c
@@ -73,9 +73,6 @@ MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
   xbt_ex_t e;
   MSG_error_t ret = MSG_OK;
   volatile smx_action_t comm = NULL;
-#ifdef HAVE_TRACING
-  double start_time = 0;
-#endif
   /* We no longer support getting a task from a specific host */
   if (host)
     THROW_UNIMPLEMENTED;
@@ -83,7 +80,7 @@ MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
   CHECK_HOST();
 #ifdef HAVE_TRACING
   TRACE_msg_task_get_start();
-  start_time = MSG_get_clock();
+  double start_time = MSG_get_clock();
 #endif
 
   /* Sanity check */
@@ -121,12 +118,13 @@ MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
     //SIMIX_req_comm_destroy(comm);
   }
 
-  if (ret != MSG_HOST_FAILURE &&
-      ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) {
 #ifdef HAVE_TRACING
+  if (ret != MSG_HOST_FAILURE &&
+      ret != MSG_TRANSFER_FAILURE &&
+      ret != MSG_TIMEOUT) {
     TRACE_msg_task_get_end(start_time, *task);
-#endif
   }
+#endif
   MSG_RETURN(ret);
 }