/* 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 "simgrid/engine.h" /* simgrid_get_clock */
#include "simgrid/host.h"
-#include "simgrid/msg.h" /* MSG_get_clock */
#include "src/xbt/log_private.hpp"
#include "xbt/sysdep.h"
#include <algorithm>
#include <cstdio>
-extern const char *xbt_log_priority_names[8];
-
static constexpr const char* ERRMSG =
"Unknown %%%c sequence in layout format (%s).\n"
"Known sequences:\n"
} else \
return 0
-#define set_sz_from_precision() \
- if (1) { \
- sz = rem_size; \
- if (precision != -1) { \
- if (precision < sz) \
- sz = precision + 1; /* +1 for the final '\0' */ \
- precision = -1; \
- } \
- } else (void)0
+#define set_sz_from_precision() \
+ if (true) { \
+ sz = rem_size; \
+ if (precision != -1) { \
+ if (precision < sz) \
+ sz = precision + 1; /* +1 for the final '\0' */ \
+ precision = -1; \
+ } \
+ } else \
+ (void)0
#define show_it(data, letter) \
- if (1) { \
+ if (true) { \
int len; \
int wd; \
if (length == -1) { \
} \
check_overflow(len); \
} else \
- (void)0
+ (void)0
-#define show_string(data) \
- if (1) { \
- const char *show_string_data = (data); \
- show_it(show_string_data ? show_string_data : "(null)", "s"); \
- } else (void)0
+#define show_string(data) \
+ if (true) { \
+ const char* show_string_data = (data); \
+ show_it(show_string_data ? show_string_data : "(null)", "s"); \
+ } else \
+ (void)0
#define show_int(data) show_it((data), "d")
#define show_double(data) show_it((data), "f")
int precision = -1;
int length = -1;
- for (char* q = static_cast<char*>(l->data) ; *q != '\0' ; q++) {
+ auto* q = static_cast<char*>(l->data);
+ while (*q != '\0') {
if (*q == '%') {
q++;
do {
check_overflow(1);
break;
case '.': /* precision specifier */
- precision = strtol(q + 1, &q, 10);
+ precision = static_cast<int>(strtol(q + 1, &q, 10));
continue; /* conversion specifier still not found, continue reading */
case '0':
case '1':
case '7':
case '8':
case '9': /* length modifier */
- length = strtol(q, &q, 10);
+ length = static_cast<int>(strtol(q, &q, 10));
continue; /* conversion specifier still not found, continue reading */
case 'c': /* category name; LOG4J compliant
should accept a precision postfix to show the hierarchy */
show_string(ev->functionName);
break;
case 'd': /* date; LOG4J compliant */
- show_double(MSG_get_clock());
+ show_double(simgrid_get_clock());
break;
case 'r': /* application age; LOG4J compliant */
- show_double(MSG_get_clock());
+ show_double(simgrid_get_clock());
break;
case 'm': { /* user-provided message; LOG4J compliant */
int sz;
xbt_abort();
}
break; /* done, continue normally */
- } while (1);
+ } while (true);
} else {
*p = *q;
check_overflow(1);
}
+ q++;
}
*p = '\0';