X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d86319f97cfcd4f445d934cd5701654fcece4c97..9a444de20a7545d1c3d10bd242f317febded25c4:/src/xbt/xbt_log_layout_format.c diff --git a/src/xbt/xbt_log_layout_format.c b/src/xbt/xbt_log_layout_format.c index 0f86c80516..d8d39e03ca 100644 --- a/src/xbt/xbt_log_layout_format.c +++ b/src/xbt/xbt_log_layout_format.c @@ -1,137 +1,253 @@ -/* $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 "portable.h" /* execinfo when available */ +#include "portable.h" /* execinfo when available */ #include "xbt/sysdep.h" -#include "xbt/log.h" -#include "gras/virtu.h" +#include "xbt/strbuff.h" +#include "xbt/log_private.h" +#include "gras/virtu.h" /* gras_os_myname (KILLME) */ +#include "xbt/synchro.h" /* xbt_thread_self_name */ #include -#include "xbt/ex_interface.h" /* backtraces */ - -extern const char *xbt_log_priority_names[7]; - - -static char *xbt_log_layout_format_doit(xbt_log_layout_t l, - xbt_log_event_t ev, - const char *msg_fmt) { - static char res[2048]; - static double begin_of_time = -1; - char *p,*q; - - if (begin_of_time<0) - begin_of_time=gras_os_time(); - p = res; +extern const char *xbt_log_priority_names[8]; + +static double format_begin_of_time = -1; + +#define ERRMSG "Unknown %%%c sequence in layout format (%s).\nKnown sequences:\n" \ + " what: %%m: user message %%c: log category %%p: log priority\n" \ + " where:\n" \ + " source: %%F: file %%L: line %%M: function %%l: location (%%F:%%L)\n" \ + " runtime: %%h: hostname %%t: thread %%P: process %%i: PID\n" \ + " backtrace: %%b: full %%B: short\n" \ + " when: %%d: date %%r: app. age\n" \ + " other: %%%%: %% %%n: new line %%e: plain space\n" + +#define XBT_LOG_BUFF_SIZE (ev->buffer_size) + +#undef check_overflow +#define check_overflow \ + if (p - ev->buffer >= XBT_LOG_BUFF_SIZE) { /* buffer overflow */ \ + return 0; \ + } else ((void)0) + +#define show_it(data,letter) \ + do { \ + if (precision == -1 && length == -1) { \ + p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%" letter, data); \ + } else if (precision == -1) { \ + sprintf(tmpfmt,"%%%d" letter,length); \ + p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), tmpfmt, data); \ + length = -1; \ + } else if (length == -1) { \ + p += sprintf(p, "%.*" letter, \ + (int) MIN(XBT_LOG_BUFF_SIZE - (p - ev->buffer), precision), \ + data);\ + precision = -1; \ + } else { \ + sprintf(tmpfmt,"%%%d.%d" letter,length, \ + (int) MIN(XBT_LOG_BUFF_SIZE - (p - ev->buffer), precision));\ + p += sprintf(p, tmpfmt, data);\ + length = precision = -1; \ + } \ + check_overflow; \ + } while (0) + +#define show_string(data) show_it(data, "s") +#define show_int(data) show_it(data, "d") +#define show_double(data) show_it(data, "f") + +static int xbt_log_layout_format_doit(xbt_log_layout_t l, + xbt_log_event_t ev, + const char *msg_fmt) +{ + char *p, *q; + char tmpfmt[50]; + int precision = -1; + int length = -1; + + + p = ev->buffer; q = l->data; while (*q != '\0') { if (*q == '%') { q++; + handle_modifier: switch (*q) { case '\0': - THROW1(arg_error,0,"Layout format (%s) ending with %%",(char*)l->data); + fprintf(stderr, "Layout format (%s) ending with %%\n", + (char *) l->data); + abort(); case '%': - *p++ = '%'; - break; - case 'n': /* platform-dependant line separator (LOG4J compliant) */ - p += sprintf(p,"\n"); - break; - case ' ': /* plain space (SimGrid extension) */ - p += sprintf(p," "); - break; - - case 'c': /* category name; LOG4J compliant - should accept a precision postfix to show the hierarchy */ - p += sprintf(p,"%s",ev->cat->name); - break; - case 'p': /* priority name; LOG4J compliant */ - p += sprintf(p, "%s", xbt_log_priority_names[ev->priority] ); - break; - - case 'h': /* host name; SimGrid extension */ - p += sprintf(p, "%s", gras_os_myname()); - break; - case 't': /* process name; LOG4J compliant (thread name) */ - p += sprintf(p, "%s", xbt_procname()); - break; - case 'i': /* process PID name; SimGrid extension */ - p += sprintf(p, "%ld", gras_os_getpid()); - break; - - case 'F': /* file name; LOG4J compliant */ - p += sprintf(p,"%s",ev->fileName); - break; - case 'l': /* location; LOG4J compliant */ - p += sprintf(p, "%s:%d", ev->fileName, ev->lineNum); - break; - case 'L': /* line number; LOG4J compliant */ - p += sprintf(p, "%d", ev->lineNum); - break; - case 'M': /* method (ie, function) name; LOG4J compliant */ - p += sprintf(p, "%s", ev->functionName); - break; - case 'b': /* backtrace; called %throwable in LOG4J */ - case 'B': /* short backtrace; called %throwable{short} in LOG4J */ + *p++ = '%'; + break; + case 'n': /* platform-dependant line separator (LOG4J compliant) */ + p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "\n"); + check_overflow; + break; + case 'e': /* plain space (SimGrid extension) */ + p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), " "); + check_overflow; + break; + + case '.': /* precision specifyier */ + q++; + sscanf(q, "%d", &precision); + q += (precision>9?2:1); + goto handle_modifier; + + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': /* length modifier */ + sscanf(q, "%d", &length); + q += (length>9?2:1); + goto handle_modifier; + + case 'c': /* category name; LOG4J compliant + should accept a precision postfix to show the hierarchy */ + show_string(ev->cat->name); + break; + case 'p': /* priority name; LOG4J compliant */ + show_string(xbt_log_priority_names[ev->priority]); + break; + + case 'h': /* host name; SimGrid extension */ + show_string(gras_os_myname()); + break; + case 't': /* thread name; LOG4J compliant */ + show_string(xbt_thread_self_name()); + break; + case 'P': /* process name; SimGrid extension */ + show_string(xbt_procname()); + break; + case 'i': /* process PID name; SimGrid extension */ + show_int((*xbt_getpid) ()); + break; + + case 'F': /* file name; LOG4J compliant */ + show_string(ev->fileName); + break; + case 'l': /* location; LOG4J compliant */ + if (precision == -1) { + p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%d", + ev->fileName, ev->lineNum); + check_overflow; + } else { + p += snprintf(p, + (int) MIN(XBT_LOG_BUFF_SIZE - (p - ev->buffer), + precision), "%s:%d", ev->fileName, + ev->lineNum); + check_overflow; + precision = -1; + } + break; + case 'L': /* line number; LOG4J compliant */ + show_int(ev->lineNum); + break; + case 'M': /* method (ie, function) name; LOG4J compliant */ + show_string(ev->functionName); + break; + case 'b': /* backtrace; called %throwable in LOG4J */ + case 'B': /* short backtrace; called %throwable{short} in LOG4J */ #if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE) - { - xbt_ex_t e; - int i; - - e.used = backtrace((void**)e.bt,XBT_BACKTRACE_SIZE); - e.bt_strings = NULL; - xbt_ex_setup_backtrace(&e); - if (*q=='B') - p += sprintf(p,"%s",e.bt_strings[2]+8); - else - for (i=2; ibuffer), + "%s\n", e.bt_strings[i] + 8); + check_overflow; + } else { + p += sprintf(p, "%.*s\n", + (int) MIN(XBT_LOG_BUFF_SIZE - + (p - ev->buffer), precision), + e.bt_strings[i] + 8); + check_overflow; + precision = -1; + } + } + + xbt_ex_free(e); + } #else - p+=sprintf(p,"(no backtrace on this arch)"); + p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), + "(no backtrace on this arch)"); + check_overflow; #endif - break; - - case 'd': /* date; LOG4J compliant */ - p += sprintf(p,"%f", gras_os_time()); - break; - case 'r': /* application age; LOG4J compliant */ - p += sprintf(p,"%f", gras_os_time()-begin_of_time); - break; - - case 'm': /* user-provided message; LOG4J compliant */ - p += vsprintf(p, msg_fmt, ev->ap); - break; + break; + + case 'd': /* date; LOG4J compliant */ + show_double(gras_os_time()); + break; + case 'r': /* application age; LOG4J compliant */ + show_double(gras_os_time() - format_begin_of_time); + break; + + case 'm': /* user-provided message; LOG4J compliant */ + if (precision == -1) { + p += vsnprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), msg_fmt, + ev->ap); + check_overflow; + } else { + p += vsnprintf(p, + (int) MIN(XBT_LOG_BUFF_SIZE - (p - ev->buffer), + precision), msg_fmt, ev->ap); + check_overflow; + precision = -1; + } + break; default: - THROW2(arg_error,0,"Unknown %%%c sequence in layout format (%s)", - *q,(char*)l->data); + fprintf(stderr, ERRMSG, *q, (char *) l->data); + abort(); } q++; } else { *(p++) = *(q++); + check_overflow; } } *p = '\0'; - return res; + + return 1; } -static void xbt_log_layout_format_free(xbt_log_layout_t lay) { +static void xbt_log_layout_format_free(xbt_log_layout_t lay) +{ free(lay->data); } -xbt_log_layout_t xbt_log_layout_format_new(char *arg) { - xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t,1); + +xbt_log_layout_t xbt_log_layout_format_new(char *arg) +{ + xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1); res->do_layout = xbt_log_layout_format_doit; - res->free_ = xbt_log_layout_format_free; - res->data = xbt_strdup((char*)arg); + res->free_ = xbt_log_layout_format_free; + res->data = xbt_strdup((char *) arg); + + if (format_begin_of_time < 0) + format_begin_of_time = gras_os_time(); + return res; }