X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07ce716b44d53a070fc2358ec727bb1975198200..87bf71ddfe2611ffedaabe6c3a9030957ae4a080:/src/xbt/xbt_log_layout_simple.c diff --git a/src/xbt/xbt_log_layout_simple.c b/src/xbt/xbt_log_layout_simple.c index 4165fc728e..539469982d 100644 --- a/src/xbt/xbt_log_layout_simple.c +++ b/src/xbt/xbt_log_layout_simple.c @@ -1,8 +1,7 @@ -/* $Id: xbt_log_layout_simple.c 6309 2009-05-26 15:29:22Z mquinson $ */ - /* layout_simple - a dumb log layout */ -/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved. */ +/* Copyright (c) 2007, 2008, 2009, 2010. 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. */ @@ -74,24 +73,22 @@ static void xbt_log_layout_simple_doit(xbt_log_layout_t l, xbt_log_appender_t app) { char *p; - + const char *procname=NULL; xbt_assert0(ev->priority >= 0, "Negative logging priority naturally forbidden"); xbt_assert1(ev->priority < sizeof(xbt_log_priority_names), "Priority %d is greater than the biggest allowed value", ev->priority); - if (simple_begin_of_time < 0) - simple_begin_of_time = gras_os_time(); - p = ev->buffer; p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "["); check_overflow; /* Display the proc info if available */ - if (strlen(xbt_procname())) { + procname=xbt_procname(); + if (strlen(procname)) { p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%s:(%d) ", - gras_os_myname(), xbt_procname(), (*xbt_getpid) ()); + gras_os_myname(), procname, (*xbt_getpid) ()); check_overflow; } @@ -125,5 +122,9 @@ xbt_log_layout_t xbt_log_layout_simple_new(char *arg) { xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1); res->do_layout = xbt_log_layout_simple_doit; + + if (simple_begin_of_time < 0) + simple_begin_of_time = gras_os_time(); + return res; }