From: alegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 21 May 2008 09:44:55 +0000 (+0000)
Subject: Do not print pointers (%p) when using INFO. This kind of output is system dependant... 
X-Git-Tag: v3.3~456
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/776fcba2a9efccb02e87d1e7e33c053708181d44?ds=sidebyside

Do not print pointers (%p) when using INFO. This kind of output is system dependant and it breaks the testsuites..


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

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index c797d5651c..51e80503d3 100644
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -153,18 +153,18 @@ void SIMIX_display_process_status(void)
 	     : ((process->simdata->suspended) ? "[SUSPENDED] " : ""));
 
     if (p_simdata->mutex) {
-      who2 = bprintf("%s Blocked on mutex %p", who, p_simdata->mutex);
+      who2 = bprintf("%s Blocked on mutex %p", who, (XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_verbose))?p_simdata->mutex:NULL);
       free(who);
       who = who2;
     } else if (p_simdata->cond) {
       who2 =
 	  bprintf
 	  ("%s Blocked on condition %p; Waiting for the following actions:",
-	   who, p_simdata->cond);
+	   who, (XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_verbose))?p_simdata->cond:NULL);
       free(who);
       who = who2;
       xbt_fifo_foreach(p_simdata->cond->actions, item, act, smx_action_t) {
-	who2 = bprintf("%s '%s'(%p)", who, act->name,act);
+	who2 = bprintf("%s '%s'(%p)", who, act->name,(XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_verbose))?act:NULL);
 	free(who);
 	who = who2;
       }