From 0f92baaa5e4a692a394bdb9e9607736449725b9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?= =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= Date: Tue, 15 Nov 2022 01:08:23 +0300 Subject: [PATCH] =?UTF-8?q?mdbx:=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20debug=5Fbegin.h=20=D0=B8=20debug=5Fe?= =?UTF-8?q?nd.h?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/debug_begin.h | 56 +++++++++++++++++++++++------------------------ src/debug_end.h | 14 ++++++------ 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/debug_begin.h b/src/debug_begin.h index 9a904095..521e99cf 100644 --- a/src/debug_begin.h +++ b/src/debug_begin.h @@ -1,42 +1,42 @@ #if defined(__GNUC__) && !defined(__LCC__) -#pragma push_macro("mdbx_trace") -#pragma push_macro("mdbx_debug") -#pragma push_macro("mdbx_verbose") -#pragma push_macro("mdbx_notice") -#pragma push_macro("mdbx_warning") -#pragma push_macro("mdbx_error") -#pragma push_macro("mdbx_assert") +#pragma push_macro("TRACE") +#pragma push_macro("DEBUG") +#pragma push_macro("VERBOSE") +#pragma push_macro("NOTICE") +#pragma push_macro("WARNING") +#pragma push_macro("ERROR") +#pragma push_macro("eASSERT") -#undef mdbx_trace -#define mdbx_trace(fmt, ...) \ - mdbx_debug_log(MDBX_LOG_TRACE, __func__, __LINE__, fmt "\n", __VA_ARGS__) +#undef TRACE +#define TRACE(fmt, ...) \ + debug_log(MDBX_LOG_TRACE, __func__, __LINE__, fmt "\n", __VA_ARGS__) -#undef mdbx_debug -#define mdbx_debug(fmt, ...) \ - mdbx_debug_log(MDBX_LOG_DEBUG, __func__, __LINE__, fmt "\n", __VA_ARGS__) +#undef DEBUG +#define DEBUG(fmt, ...) \ + debug_log(MDBX_LOG_DEBUG, __func__, __LINE__, fmt "\n", __VA_ARGS__) -#undef mdbx_verbose -#define mdbx_verbose(fmt, ...) \ - mdbx_debug_log(MDBX_LOG_VERBOSE, __func__, __LINE__, fmt "\n", __VA_ARGS__) +#undef VERBOSE +#define VERBOSE(fmt, ...) \ + debug_log(MDBX_LOG_VERBOSE, __func__, __LINE__, fmt "\n", __VA_ARGS__) -#undef mdbx_notice -#define mdbx_notice(fmt, ...) \ - mdbx_debug_log(MDBX_LOG_NOTICE, __func__, __LINE__, fmt "\n", __VA_ARGS__) +#undef NOTICE +#define NOTICE(fmt, ...) \ + debug_log(MDBX_LOG_NOTICE, __func__, __LINE__, fmt "\n", __VA_ARGS__) -#undef mdbx_warning -#define mdbx_warning(fmt, ...) \ - mdbx_debug_log(MDBX_LOG_WARN, __func__, __LINE__, fmt "\n", __VA_ARGS__) +#undef WARNING +#define WARNING(fmt, ...) \ + debug_log(MDBX_LOG_WARN, __func__, __LINE__, fmt "\n", __VA_ARGS__) -#undef mdbx_error -#define mdbx_error(fmt, ...) \ - mdbx_debug_log(MDBX_LOG_ERROR, __func__, __LINE__, fmt "\n", __VA_ARGS__) +#undef ERROR +#define ERROR(fmt, ...) \ + debug_log(MDBX_LOG_ERROR, __func__, __LINE__, fmt "\n", __VA_ARGS__) -#undef mdbx_assert -#define mdbx_assert(env, expr) mdbx_ensure(env, expr) +#undef eASSERT +#define eASSERT(env, expr) ENSURE(env, expr) #if !defined(__clang__) -#pragma GCC optimize("-O0") +#pragma GCC optimize("-Og") #endif #endif /* GCC only */ diff --git a/src/debug_end.h b/src/debug_end.h index a854f715..bbf66526 100644 --- a/src/debug_end.h +++ b/src/debug_end.h @@ -1,12 +1,12 @@ #if defined(__GNUC__) && !defined(__LCC__) -#pragma pop_macro("mdbx_trace") -#pragma pop_macro("mdbx_debug") -#pragma pop_macro("mdbx_verbose") -#pragma pop_macro("mdbx_notice") -#pragma pop_macro("mdbx_warning") -#pragma pop_macro("mdbx_error") -#pragma pop_macro("mdbx_assert") +#pragma pop_macro("TRACE") +#pragma pop_macro("DEBUG") +#pragma pop_macro("VERBOSE") +#pragma pop_macro("NOTICE") +#pragma pop_macro("WARNING") +#pragma pop_macro("ERROR") +#pragma pop_macro("eASSERT") #if !defined(__clang__) #pragma GCC reset_options