ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-04 19:44:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx-tools: refine assertions logging inside mdbx_chk.

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2022-07-07 15:51:11 +03:00
parent bc744a843a
commit 6076c510f8
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mdbx_chk.c
View File

@ -125,7 +125,8 @@ static void MDBX_PRINTF_ARGS(1, 2) print(const char *msg, ...) {
} }
} }
static void va_log(MDBX_log_level_t level, const char *msg, va_list args) { static void va_log(MDBX_log_level_t level, const char *function, int line,
const char *msg, va_list args) {
static const char *const prefixes[] = { static const char *const prefixes[] = {
"!!!fatal: ", " ! " /* error */, " ~ " /* warning */, "!!!fatal: ", " ! " /* error */, " ~ " /* warning */,
" " /* notice */, " // " /* verbose */, " //// " /* debug */, " " /* notice */, " // " /* verbose */, " //// " /* debug */,
@ -143,13 +144,20 @@ static void va_log(MDBX_log_level_t level, const char *msg, va_list args) {
fflush(nullptr); fflush(nullptr);
fputs(prefixes[level], out); fputs(prefixes[level], out);
vfprintf(out, msg, args); vfprintf(out, msg, args);
if (msg[strlen(msg) - 1] != '\n')
const bool have_lf = msg[strlen(msg) - 1] == '\n';
if (level == MDBX_LOG_FATAL && function && line)
fprintf(out, have_lf ? " %s(), %u\n" : " (%s:%u)\n",
function + (strncmp(function, "mdbx_", 5) ? 5 : 0), line);
else if (!have_lf)
fputc('\n', out); fputc('\n', out);
fflush(nullptr); fflush(nullptr);
} }
if (level == MDBX_LOG_FATAL) { if (level == MDBX_LOG_FATAL) {
#if !MDBX_DEBUG && !MDBX_FORCE_ASSERTIONS
exit(EXIT_FAILURE_MDBX); exit(EXIT_FAILURE_MDBX);
#endif
abort(); abort();
} }
} }
@ -157,7 +165,7 @@ static void va_log(MDBX_log_level_t level, const char *msg, va_list args) {
static void MDBX_PRINTF_ARGS(1, 2) error(const char *msg, ...) { static void MDBX_PRINTF_ARGS(1, 2) error(const char *msg, ...) {
va_list args; va_list args;
va_start(args, msg); va_start(args, msg);
va_log(MDBX_LOG_ERROR, msg, args); va_log(MDBX_LOG_ERROR, nullptr, 0, msg, args);
va_end(args); va_end(args);
} }
@ -166,7 +174,7 @@ static void logger(MDBX_log_level_t level, const char *function, int line,
(void)line; (void)line;
(void)function; (void)function;
if (level < MDBX_LOG_EXTRA) if (level < MDBX_LOG_EXTRA)
va_log(level, msg, args); va_log(level, function, line, msg, args);
} }
static int check_user_break(void) { static int check_user_break(void) {