diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2023-11-29 22:39:54 +0000 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2023-11-29 22:39:54 +0000 |
| commit | 21cb7d04c387e4198ca8098a884c78b56ffcf4c2 (patch) | |
| tree | 84fe5690df1551f0bb2bdfe1a13aacd29ebc1de7 /src/nvim/log.h | |
| parent | d9c904f85a23a496df4eb6be42aa43f007b22d50 (diff) | |
| parent | 4a8bf24ac690004aedf5540fa440e788459e5e34 (diff) | |
| download | rneovim-colorcolchar.tar.gz rneovim-colorcolchar.tar.bz2 rneovim-colorcolchar.zip | |
Merge remote-tracking branch 'upstream/master' into colorcolcharcolorcolchar
Diffstat (limited to 'src/nvim/log.h')
| -rw-r--r-- | src/nvim/log.h | 51 |
1 files changed, 12 insertions, 39 deletions
diff --git a/src/nvim/log.h b/src/nvim/log.h index 14d46c2ea7..cac074d146 100644 --- a/src/nvim/log.h +++ b/src/nvim/log.h @@ -1,11 +1,10 @@ -#ifndef NVIM_LOG_H -#define NVIM_LOG_H +#pragma once #include <stdbool.h> #include <stdio.h> #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); @@ -17,54 +16,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__) @@ -78,4 +52,3 @@ #ifdef INCLUDE_GENERATED_DECLARATIONS # include "log.h.generated.h" #endif -#endif // NVIM_LOG_H |