X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5cfd88211415db40a7b8eaa8735e668f2bc1ab97..3676269c65359df0174fd13b6c11687992437df8:/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 867294cbe3..be6b390676 100644 --- a/src/xbt/xbt_log_layout_simple.c +++ b/src/xbt/xbt_log_layout_simple.c @@ -1,115 +1,92 @@ -/* $Id$ */ - /* layout_simple - a dumb log layout */ -/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved. */ +/* Copyright (c) 2007-2011. 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. */ #include "xbt/sysdep.h" -#include "xbt/strbuff.h" /* For dynamic version when the static one fails */ +#include "xbt/strbuff.h" /* For dynamic version when the static one fails */ #include "xbt/log_private.h" -#include "xbt/synchro.h" /* xbt_thread_name */ -#include "gras/virtu.h" +#include "simgrid/simix.h" /* SIMIX_host_self_get_name */ +#include "surf/surf.h" #include #include "portable.h" -extern const char *xbt_log_priority_names[7]; - -static double begin_of_time = -1; - -static void xbt_log_layout_simple_dynamic(xbt_log_layout_t l, - xbt_log_event_t ev, - const char*fmt, - xbt_log_appender_t app) { - xbt_strbuff_t buff = xbt_strbuff_new(); - char loc_buff[256]; - char *p; - - /* Put every static information in a static buffer, and copy them in the dyn one */ - p = loc_buff; - p += snprintf(p,256-(p-ev->buffer),"["); - - if(strlen(xbt_procname())) - p += snprintf(p,256-(p-ev->buffer),"%s:%s:(%d) ", - gras_os_myname(), xbt_procname(),(*xbt_getpid)()); - p += snprintf(p,256-(p-ev->buffer),"%f] ", gras_os_time()-begin_of_time); - if (ev->priority != xbt_log_priority_info) - p += snprintf(p,256-(p-ev->buffer), "%s:%d: ", ev->fileName, ev->lineNum); - p += snprintf(p,256-(p-ev->buffer), "[%s/%s] ", - ev->cat->name, xbt_log_priority_names[ev->priority] ); - - xbt_strbuff_append(buff,loc_buff); - - vasprintf(&p,fmt,ev->ap_copy); - xbt_strbuff_append(buff,p); - free(p); - - xbt_strbuff_append(buff,"\n"); - - app->do_append(app,buff->data); - xbt_strbuff_free(buff); -} - -/* only used after the format using: we suppose that the buffer is big enough to display our data */ -#define check_overflow \ - if (p-ev->buffer > XBT_LOG_BUFF_SIZE) { /* buffer overflow */ \ - xbt_log_layout_simple_dynamic(l,ev,fmt,app); \ - return; \ - } +extern const char *xbt_log_priority_names[8]; +extern int xbt_log_no_loc; -static void xbt_log_layout_simple_doit(xbt_log_layout_t l, - xbt_log_event_t ev, - const char *fmt, - xbt_log_appender_t app) { - char *p; +static double simple_begin_of_time = -1; - xbt_assert0(ev->priority>=0, - "Negative logging priority naturally forbidden"); - xbt_assert1(ev->prioritypriority); +#define check_overflow(len) \ + if ((rem_size -= (len)) > 0) { \ + p += (len); \ + } else \ + return 0 - if (begin_of_time<0) - begin_of_time=gras_os_time(); +static int xbt_log_layout_simple_doit(xbt_log_layout_t l, + xbt_log_event_t ev, + const char *fmt) +{ + char *p = ev->buffer; + int rem_size = ev->buffer_size; + const char *procname; + int len; - p = ev->buffer; - p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"["); - check_overflow; + *p = '['; + check_overflow(1); /* Display the proc info if available */ - if(strlen(xbt_procname())) { - p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"%s:%s:(%d) ", - gras_os_myname(), xbt_procname(),(*xbt_getpid)()); - check_overflow; + procname = xbt_procname(); + if (procname && *procname) { + len = snprintf(p, rem_size, "%s:%s:(%d) ", + SIMIX_host_self_get_name(), procname, xbt_getpid()); + check_overflow(len); + } + else if (!procname) { + len = snprintf(p, rem_size, "%s::(%d) ", + SIMIX_host_self_get_name(), xbt_getpid()); + check_overflow(len); } - - /* Display the date */ - p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"%f] ", gras_os_time()-begin_of_time); - check_overflow; - /* Display file position if not INFO*/ - if (ev->priority != xbt_log_priority_info) - p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "%s:%d: ", ev->fileName, ev->lineNum); + /* Display the date */ + len = snprintf(p, rem_size, "%f] ", + surf_get_clock() - simple_begin_of_time); + check_overflow(len); + + /* Display file position if not INFO */ + if (ev->priority != xbt_log_priority_info && !xbt_log_no_loc) { + len = snprintf(p, rem_size, "%s:%d: ", + ev->fileName, ev->lineNum); + check_overflow(len); + } /* Display category name */ - p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "[%s/%s] ", - ev->cat->name, xbt_log_priority_names[ev->priority] ); + len = snprintf(p, rem_size, "[%s/%s] ", + ev->cat->name, xbt_log_priority_names[ev->priority]); + check_overflow(len); /* Display user-provided message */ - p += vsnprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), fmt, ev->ap); - check_overflow; - + len = vsnprintf(p, rem_size, fmt, ev->ap); + check_overflow(len); + /* End it */ - p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "\n"); - check_overflow; - app->do_append(app,ev->buffer); + *p = '\n'; + check_overflow(1); + *p = '\0'; + + return 1; } -xbt_log_layout_t xbt_log_layout_simple_new(char *arg) { - xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t,1); +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 = surf_get_clock(); + return res; }