- *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++;
- q += sscanf(q,"%d",&precision);
- goto handle_modifier;
-
- case 'c': /* category name; LOG4J compliant
- should accept a precision postfix to show the hierarchy */
- if (precision == -1) {
- p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"%s",ev->cat->name);
- check_overflow;
- } else {
- p += sprintf(p,"%.*s",(int)MIN(XBT_LOG_BUFF_SIZE-(p-ev->buffer),precision),ev->cat->name);
- check_overflow;
- precision = -1;
- }
- break;
- case 'p': /* priority name; LOG4J compliant */
- if (precision == -1) {
- p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "%s", xbt_log_priority_names[ev->priority] );
- check_overflow;
- } else {
- p += sprintf(p, "%.*s", (int)MIN(XBT_LOG_BUFF_SIZE-(p-ev->buffer),precision), xbt_log_priority_names[ev->priority] );
- check_overflow;
- precision = -1;
- }
- break;
-
- case 'h': /* host name; SimGrid extension */
- if (precision == -1) {
- p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "%s", gras_os_myname());
- check_overflow;
- } else {
- p += sprintf(p, "%.*s", (int)MIN(XBT_LOG_BUFF_SIZE-(p-ev->buffer),precision), gras_os_myname());
- check_overflow;
- precision = -1;
- }
- break;
- case 't': /* thread name; LOG4J compliant */
- if (precision == -1) {
- p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "%s", xbt_thread_self_name());
- check_overflow;
- } else {
- p += sprintf(p, "%.*s", (int)MIN(XBT_LOG_BUFF_SIZE-(p-ev->buffer),precision), xbt_thread_self_name());
- check_overflow;
- precision = -1;
- }
- break;
- case 'P': /* process name; SimGrid extension */
- if (precision == -1) {
- p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "%s", xbt_procname());
- check_overflow;
- } else {
- p += sprintf(p, "%.*s", (int)MIN(XBT_LOG_BUFF_SIZE-(p-ev->buffer),precision),xbt_procname());
- check_overflow;
- precision = -1;
- }
- break;
- case 'i': /* process PID name; SimGrid extension */
- if (precision == -1) {
- p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "%d", (*xbt_getpid)());
- check_overflow;
- } else {
- p += sprintf(p, "%.*d", (int)MIN(XBT_LOG_BUFF_SIZE-(p-ev->buffer),precision), (*xbt_getpid)());
- check_overflow;
- precision = -1;
- }
- break;
-
- case 'F': /* file name; LOG4J compliant */
- if (precision == -1) {
- p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"%s",ev->fileName);
- check_overflow;
- } else {
- p += sprintf(p,"%.*s",(int)MIN(XBT_LOG_BUFF_SIZE-(p-ev->buffer),precision), ev->fileName);
- check_overflow;
- precision = -1;
- }
- 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 */
- if (precision == -1) {
- p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "%d", ev->lineNum);
- check_overflow;
- } else {
- p += sprintf(p, "%.*d", (int)MIN(XBT_LOG_BUFF_SIZE-(p-ev->buffer),precision), ev->lineNum);
- check_overflow;
- precision = -1;
- }
- break;
- case 'M': /* method (ie, function) name; LOG4J compliant */
- if (precision == -1) {
- p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "%s", ev->functionName);
- check_overflow;
- } else {
- p += sprintf(p, "%.*s", (int)MIN(XBT_LOG_BUFF_SIZE-(p-ev->buffer),precision), ev->functionName);
- check_overflow;
- precision = -1;
- }
- break;
- case 'b': /* backtrace; called %throwable in LOG4J */
- case 'B': /* short backtrace; called %throwable{short} in LOG4J */
+ *p = '%';
+ check_overflow(1);
+ break;
+ case 'n': /* platform-dependant line separator; LOG4J compliant */
+ *p = '\n';
+ check_overflow(1);
+ break;
+ case 'e': /* plain space; SimGrid extension */
+ *p = ' ';
+ check_overflow(1);
+ break;
+ case '.': /* precision specifier */
+ precision = strtol(q + 1, &q, 10);
+ 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 */
+ length = strtol(q, &q, 10);
+ 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(SIMIX_host_self_get_name());
+ 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 */
+ int len, sz;
+ set_sz_from_precision();
+ len = snprintf(p, sz, "%s:%d", ev->fileName, ev->lineNum);
+ check_overflow(MIN(sz, len));
+ 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 */