From fd07acc45f0e8aa9b7e4a511054962c0eca72fca Mon Sep 17 00:00:00 2001 From: cherierm Date: Fri, 27 Jun 2008 13:46:18 +0000 Subject: [PATCH] use %#x format instead of %p because Windows and Linux use it in differently. This is cause an output different in the tesh files. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5846 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/simix/smx_global.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c index 4c933f7474..668bd417c1 100644 --- a/src/simix/smx_global.c +++ b/src/simix/smx_global.c @@ -1,4 +1,4 @@ -/* $Id: smx_global.c 5483 2008-05-21 09:53:01Z alegrand $ */ +/* $Id$ */ /* Copyright (c) 2007 Arnaud Legrand, Bruno Donassolo. All rights reserved. */ @@ -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, (XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_verbose))?p_simdata->mutex:(void*)0xdead); + who2 = bprintf("%s Blocked on mutex %#x", who, (XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_verbose))?p_simdata->mutex:(void*)0xdead); free(who); who = who2; } else if (p_simdata->cond) { who2 = bprintf - ("%s Blocked on condition %p; Waiting for the following actions:", + ("%s Blocked on condition %#x; Waiting for the following actions:", who, (XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_verbose))?p_simdata->cond:(void*)0xdead); free(who); who = who2; xbt_fifo_foreach(p_simdata->cond->actions, item, act, smx_action_t) { - who2 = bprintf("%s '%s'(%p)", who, act->name,(XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_verbose))?act:(void*)0xdead); + who2 = bprintf("%s '%s'(%#x)", who, act->name,(XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_verbose))?act:(void*)0xdead); free(who); who = who2; } -- 2.20.1