Skip to content

Commit 90a2341

Browse files
author
MarcoFalke
committed
Merge #17218: Replace the LogPrint function with a macro
8734c85 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 8734c85 Tree-SHA512: 19e995eaef0ff008a9f8c1fd6f3882f1fbf6794dd7e2dcf5c68056be787eee198d2956037d4ffba2b01e7658b47eba276cd7132feede78832373b3304203961e
2 parents ddd4629 + 8734c85 commit 90a2341

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

src/logging.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,13 @@ static inline void LogPrintf(const char* fmt, const Args&... args)
155155
}
156156
}
157157

158-
template <typename... Args>
159-
static inline void LogPrint(const BCLog::LogFlags& category, const Args&... args)
160-
{
161-
if (LogAcceptCategory((category))) {
162-
LogPrintf(args...);
163-
}
164-
}
158+
// Use a macro instead of a function for conditional logging to prevent
159+
// evaluating arguments when logging for the category is not enabled.
160+
#define LogPrint(category, ...) \
161+
do { \
162+
if (LogAcceptCategory((category))) { \
163+
LogPrintf(__VA_ARGS__); \
164+
} \
165+
} while (0)
165166

166167
#endif // BITCOIN_LOGGING_H

0 commit comments

Comments
 (0)