highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-20 05:42:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #12970: logging: bypass timestamp formatting when not logging

Browse Source 
339730a6d8 logging: bypass timestamp formatting when not logging (Cory Fields)

Pull request description:

  As suggested by @laanwj on IRC:
  ```
  <cfields> whoa
  <cfields> Leaving test case "knapsack_solver_test"; testing time: 358694ms
  <cfields> i386 + old wine ^^
  <cfields> Leaving test case "knapsack_solver_test"; testing time: 6781ms
  <cfields> ^^ same, but with the LogPrint commented out
  ...
  <wumpus> if both log-to-file and log-to-console is disabled, it should probably bypass all logging
  ```
  Edit: The painful line commented out being the LogPrintf in CWallet::AddToWallet.

Tree-SHA512: bc6da67dcdf05e9164fff7a7e9980de897e6f1b0d3f6e1ebde2162cbcba7d54a6ec94283534eb5a1ebde7134533d7fe7e496aa35ea3128c567ed6483eae5212c
This commit is contained in:
Pieter Wuille 2018-04-12 18:27:37 -07:00
commit 5df84de583
No known key found for this signature in database
GPG Key ID: A636E97631F767E0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/util.h
View File

@ -145,14 +145,16 @@ template<typename T, typename... Args> static inline void MarkUsed(const T& t, c
#define LogPrint(category, ...) do { MarkUsed(__VA_ARGS__); } while(0) #define LogPrint(category, ...) do { MarkUsed(__VA_ARGS__); } while(0)
#else #else
#define LogPrintf(...) do { \ #define LogPrintf(...) do { \
std::string _log_msg_; /* Unlikely name to avoid shadowing variables */ \ if (fPrintToConsole || fPrintToDebugLog) { \
try { \ std::string _log_msg_; /* Unlikely name to avoid shadowing variables */ \
_log_msg_ = tfm::format(__VA_ARGS__); \ try { \
} catch (tinyformat::format_error &fmterr) { \ _log_msg_ = tfm::format(__VA_ARGS__); \
/* Original format string will have newline so don't add one here */ \ } catch (tinyformat::format_error &fmterr) { \
_log_msg_ = "Error \"" + std::string(fmterr.what()) + "\" while formatting log message: " + FormatStringFromLogArgs(__VA_ARGS__); \ /* Original format string will have newline so don't add one here */ \
_log_msg_ = "Error \"" + std::string(fmterr.what()) + "\" while formatting log message: " + FormatStringFromLogArgs(__VA_ARGS__); \
} \
LogPrintStr(_log_msg_); \
} \ } \
LogPrintStr(_log_msg_); \
} while(0) } while(0)
#define LogPrint(category, ...) do { \ #define LogPrint(category, ...) do { \