nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

In coverage builds, avoid basic-block complexity in log_debug

Browse Source 
Ordinarily we skip calling log_fn(LOG_DEBUG,...) if debug logging is
completely disabled.  However, in coverage builds, this means that
we get spurious complaints about partially covered basic blocks, in
a way that makes our coverage determinism harder to check.
This commit is contained in:
Nick Mathewson 2019-05-15 08:27:02 -04:00
parent 29955f13e5
commit 2bb5d8148b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/log/log.h
View File

@ -194,6 +194,11 @@ void tor_log_get_logfile_names(struct smartlist_t *out);
extern int log_global_min_severity_; extern int log_global_min_severity_;
#ifdef TOR_COVERAGE
/* For coverage builds, we try to avoid our log_debug optimization, since it
* can have weird effects on internal macro coverage. */
#define debug_logging_enabled() (1)
#else
static inline bool debug_logging_enabled(void); static inline bool debug_logging_enabled(void);
/** /**
* Return true iff debug logging is enabled for at least one domain. * Return true iff debug logging is enabled for at least one domain.
@ -202,6 +207,7 @@ static inline bool debug_logging_enabled(void)
{ {
return PREDICT_UNLIKELY(log_global_min_severity_ == LOG_DEBUG); return PREDICT_UNLIKELY(log_global_min_severity_ == LOG_DEBUG);
} }
#endif
void log_fn_(int severity, log_domain_mask_t domain, void log_fn_(int severity, log_domain_mask_t domain,
const char *funcname, const char *format, ...) const char *funcname, const char *format, ...)