diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-03-26 20:13:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-03-26 20:13:49 -0400 |
| commit | a47b61f329fbe06b7b4935cf9c1923d96a74b649 (patch) | |
| tree | 283c23aa4230a26fe9b40b1001cb05a457995b4d /src/lib/log/log.h | |
| parent | 57999e330b82fa3a360406dfb28b7a35fb50d602 (diff) | |
| parent | 3767eff9bb712bccc86718647c7dc84998a7f95f (diff) | |
| download | tor-a47b61f329fbe06b7b4935cf9c1923d96a74b649.tar.gz tor-a47b61f329fbe06b7b4935cf9c1923d96a74b649.zip | |
Merge branch 'messaging_v3' into messaging_v3_merged
Diffstat (limited to 'src/lib/log/log.h')
| -rw-r--r-- | src/lib/log/log.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/lib/log/log.h b/src/lib/log/log.h index 0420f35ee0..a381220af0 100644 --- a/src/lib/log/log.h +++ b/src/lib/log/log.h @@ -114,8 +114,9 @@ #define LD_PT (1u<<27) /** Bootstrap tracker. */ #define LD_BTRACK (1u<<28) -/** Number of logging domains in the code. */ -#define N_LOGGING_DOMAINS 29 +/** Message-passing backend. */ +#define LD_MESG (1u<<29) +#define N_LOGGING_DOMAINS 30 /** This log message is not safe to send to a callback-based logger * immediately. Used as a flag, not a log domain. */ @@ -193,6 +194,15 @@ void tor_log_get_logfile_names(struct smartlist_t *out); extern int log_global_min_severity_; +static inline bool debug_logging_enabled(void); +/** + * Return true iff debug logging is enabled for at least one domain. + */ +static inline bool debug_logging_enabled(void) +{ + return PREDICT_UNLIKELY(log_global_min_severity_ == LOG_DEBUG); +} + void log_fn_(int severity, log_domain_mask_t domain, const char *funcname, const char *format, ...) CHECK_PRINTF(4,5); @@ -222,8 +232,8 @@ void tor_log_string(int severity, log_domain_mask_t domain, log_fn_ratelim_(ratelim, severity, domain, __FUNCTION__, args) #define log_debug(domain, args...) \ STMT_BEGIN \ - if (PREDICT_UNLIKELY(log_global_min_severity_ == LOG_DEBUG)) \ - log_fn_(LOG_DEBUG, domain, __FUNCTION__, args); \ + if (debug_logging_enabled()) \ + log_fn_(LOG_DEBUG, domain, __FUNCTION__, args); \ STMT_END #define log_info(domain, args...) \ log_fn_(LOG_INFO, domain, __FUNCTION__, args) @@ -240,8 +250,8 @@ void tor_log_string(int severity, log_domain_mask_t domain, #define log_debug(domain, args, ...) \ STMT_BEGIN \ - if (PREDICT_UNLIKELY(log_global_min_severity_ == LOG_DEBUG)) \ - log_fn_(LOG_DEBUG, domain, __FUNCTION__, args, ##__VA_ARGS__); \ + if (debug_logging_enabled()) \ + log_fn_(LOG_DEBUG, domain, __FUNCTION__, args, ##__VA_ARGS__); \ STMT_END #define log_info(domain, args,...) \ log_fn_(LOG_INFO, domain, __FUNCTION__, args, ##__VA_ARGS__) |