From 2ba224e1526681c1a0b1b2b095b1ef2b0874db48 Mon Sep 17 00:00:00 2001 From: bfredl Date: Sun, 26 Feb 2023 12:51:03 +0100 Subject: refactor(log): reduce compile time LOG_LEVEL granularity --- src/nvim/log.h | 45 ++++++++++----------------------------------- 1 file changed, 10 insertions(+), 35 deletions(-) (limited to 'src/nvim/log.h') diff --git a/src/nvim/log.h b/src/nvim/log.h index 14d46c2ea7..6866680de2 100644 --- a/src/nvim/log.h +++ b/src/nvim/log.h @@ -17,54 +17,29 @@ # define NVIM_PROBE(name, n, ...) #endif -#define LOGLVL_TRC 0 #define LOGLVL_DBG 1 #define LOGLVL_INF 2 #define LOGLVL_WRN 3 #define LOGLVL_ERR 4 -#define DLOG(...) -#define DLOGN(...) -#define ILOG(...) -#define ILOGN(...) -#define WLOG(...) -#define WLOGN(...) -#define ELOG(...) -#define ELOGN(...) - -#ifndef MIN_LOG_LEVEL -# define MIN_LOG_LEVEL LOGLVL_INF -#endif - #define LOG(level, ...) logmsg((level), NULL, __func__, __LINE__, true, __VA_ARGS__) -#if MIN_LOG_LEVEL <= LOGLVL_DBG -# undef DLOG -# undef DLOGN +#ifdef NVIM_LOG_DEBUG # define DLOG(...) logmsg(LOGLVL_DBG, NULL, __func__, __LINE__, true, __VA_ARGS__) # define DLOGN(...) logmsg(LOGLVL_DBG, NULL, __func__, __LINE__, false, __VA_ARGS__) -#endif - -#if MIN_LOG_LEVEL <= LOGLVL_INF -# undef ILOG -# undef ILOGN # define ILOG(...) logmsg(LOGLVL_INF, NULL, __func__, __LINE__, true, __VA_ARGS__) # define ILOGN(...) logmsg(LOGLVL_INF, NULL, __func__, __LINE__, false, __VA_ARGS__) +#else +# define DLOG(...) +# define DLOGN(...) +# define ILOG(...) +# define ILOGN(...) #endif -#if MIN_LOG_LEVEL <= LOGLVL_WRN -# undef WLOG -# undef WLOGN -# define WLOG(...) logmsg(LOGLVL_WRN, NULL, __func__, __LINE__, true, __VA_ARGS__) -# define WLOGN(...) logmsg(LOGLVL_WRN, NULL, __func__, __LINE__, false, __VA_ARGS__) -#endif - -#if MIN_LOG_LEVEL <= LOGLVL_ERR -# undef ELOG -# undef ELOGN -# define ELOG(...) logmsg(LOGLVL_ERR, NULL, __func__, __LINE__, true, __VA_ARGS__) -# define ELOGN(...) logmsg(LOGLVL_ERR, NULL, __func__, __LINE__, false, __VA_ARGS__) -#endif +#define WLOG(...) logmsg(LOGLVL_WRN, NULL, __func__, __LINE__, true, __VA_ARGS__) +#define WLOGN(...) logmsg(LOGLVL_WRN, NULL, __func__, __LINE__, false, __VA_ARGS__) +#define ELOG(...) logmsg(LOGLVL_ERR, NULL, __func__, __LINE__, true, __VA_ARGS__) +#define ELOGN(...) logmsg(LOGLVL_ERR, NULL, __func__, __LINE__, false, __VA_ARGS__) #ifdef HAVE_EXECINFO_BACKTRACE # define LOG_CALLSTACK() log_callstack(__func__, __LINE__) -- cgit From 4f8941c1a5f1ef6caa410feeb52e343db22763ce Mon Sep 17 00:00:00 2001 From: dundargoc Date: Fri, 10 Nov 2023 12:23:42 +0100 Subject: refactor: replace manual header guards with #pragma once It is less error-prone than manually defining header guards. Pretty much all compilers support it even if it's not part of the C standard. --- src/nvim/log.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/nvim/log.h') diff --git a/src/nvim/log.h b/src/nvim/log.h index 6866680de2..b03c7dbc26 100644 --- a/src/nvim/log.h +++ b/src/nvim/log.h @@ -1,5 +1,4 @@ -#ifndef NVIM_LOG_H -#define NVIM_LOG_H +#pragma once #include #include @@ -53,4 +52,3 @@ #ifdef INCLUDE_GENERATED_DECLARATIONS # include "log.h.generated.h" #endif -#endif // NVIM_LOG_H -- cgit From 79b6ff28ad1204fbb4199b9092f5c578d88cb28e Mon Sep 17 00:00:00 2001 From: dundargoc Date: Tue, 28 Nov 2023 20:31:00 +0100 Subject: refactor: fix headers with IWYU --- src/nvim/log.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/log.h') diff --git a/src/nvim/log.h b/src/nvim/log.h index b03c7dbc26..cac074d146 100644 --- a/src/nvim/log.h +++ b/src/nvim/log.h @@ -4,7 +4,7 @@ #include #include "auto/config.h" -#include "nvim/macros.h" +#include "nvim/macros_defs.h" // USDT probes. Example invocation: // NVIM_PROBE(nvim_foo_bar, 1, string.data); -- cgit