diff options
author | MarcoFalke <falke.marco@gmail.com> | 2019-11-01 10:14:07 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2019-11-01 10:14:15 -0400 |
commit | 90a2341713fbef59aef3a9a3be5c7fba2cc87d22 (patch) | |
tree | 068c4aa5b02146102b4f56a58209e30c06566a74 | |
parent | ddd46293bd83ed6339dd26ddf886d31eefa1a9b5 (diff) | |
parent | 8734c856f85cb506fa97596383dd7e7b9edd7e03 (diff) | |
download | bitcoin-90a2341713fbef59aef3a9a3be5c7fba2cc87d22.tar.xz |
Merge #17218: Replace the LogPrint function with a macro
8734c856f85cb506fa97596383dd7e7b9edd7e03 Replace the LogPrint function with a macro (Jeffrey Czyz)
Pull request description:
Calling `LogPrint` with a category that is not enabled results in
evaluating the remaining function arguments, which may be arbitrarily
complex (and possibly expensive) expressions. Defining `LogPrint` as a
macro prevents this unnecessary expression evaluation.
This is a partial revert of #14209. The decision to revert is discussed
in #16688, which adds verbose logging for validation event notification.
ACKs for top commit:
jnewbery:
ACK 8734c856f85cb506fa97596383dd7e7b9edd7e03
Tree-SHA512: 19e995eaef0ff008a9f8c1fd6f3882f1fbf6794dd7e2dcf5c68056be787eee198d2956037d4ffba2b01e7658b47eba276cd7132feede78832373b3304203961e
-rw-r--r-- | src/logging.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/logging.h b/src/logging.h index 75cd5353c0..e37c0c823b 100644 --- a/src/logging.h +++ b/src/logging.h @@ -155,12 +155,13 @@ static inline void LogPrintf(const char* fmt, const Args&... args) } } -template <typename... Args> -static inline void LogPrint(const BCLog::LogFlags& category, const Args&... args) -{ - if (LogAcceptCategory((category))) { - LogPrintf(args...); - } -} +// Use a macro instead of a function for conditional logging to prevent +// evaluating arguments when logging for the category is not enabled. +#define LogPrint(category, ...) \ + do { \ + if (LogAcceptCategory((category))) { \ + LogPrintf(__VA_ARGS__); \ + } \ + } while (0) #endif // BITCOIN_LOGGING_H |