Merge pull request #701 from evoskuil/master

Fix parser with HAVE_LOGV disabled, add hardware info to startup.
libbitcoin · Dec 16, 2024 · b4cb9cc · b4cb9cc
2 parents 05508f9 + 14079b7
commit b4cb9cc
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 18 deletions.
diff --git a/console/executor_dumps.cpp b/console/executor_dumps.cpp
@@ -61,20 +61,19 @@ void executor::dump_version() const
 // The "try" functions are safe for instructions not compiled in.
 void executor::dump_hardware() const
 {
-    logger("Intrinsics...");
-    logger(format("arm..... platform:%1%.") % with_arm);
-    logger(format("intel... platform:%1%.") % with_xcpu);
-    logger(format("avx512.. platform:%1% compiled:%2%.") % system::try_avx512() % with_avx512);
-    logger(format("avx2.... platform:%1% compiled:%2%.") % system::try_avx2() % with_avx2);
-    logger(format("sse41... platform:%1% compiled:%2%.") % system::try_sse41() % with_sse41);
-    logger(format("shani... platform:%1% compiled:%2%.") % system::try_shani() % with_shani);
-    logger(format("neon.... platform:%1% compiled:%2%.") % system::try_neon() % with_neon);
+    logger(BN_HARDWARE_HEADER);
+    logger(format("arm..... " BN_HARDWARE_TABLE1) % with_arm);
+    logger(format("intel... " BN_HARDWARE_TABLE1) % with_xcpu);
+    logger(format("avx512.. " BN_HARDWARE_TABLE2) % system::try_avx512() % with_avx512);
+    logger(format("avx2.... " BN_HARDWARE_TABLE2) % system::try_avx2() % with_avx2);
+    logger(format("sse41... " BN_HARDWARE_TABLE2) % system::try_sse41() % with_sse41);
+    logger(format("shani... " BN_HARDWARE_TABLE2) % system::try_shani() % with_shani);
+    logger(format("neon.... " BN_HARDWARE_TABLE2) % system::try_neon() % with_neon);
 }
 
 // logging compilation and initial values.
 void executor::dump_options() const
 {
-    logger(BN_NODE_INTERRUPT);
     logger(BN_LOG_TABLE_HEADER);
     logger(format("[a]pplication.. " BN_LOG_TABLE) % levels::application_defined % toggle_.at(levels::application));
     logger(format("[n]ews......... " BN_LOG_TABLE) % levels::news_defined % toggle_.at(levels::news));

diff --git a/console/executor_runner.cpp b/console/executor_runner.cpp
@@ -141,7 +141,9 @@ bool executor::do_run()
     // Stopped by stopper.
     capture_.start();
     dump_version();
+    dump_hardware();
     dump_options();
+    logger(BN_NODE_INTERRUPT);
 
     // Create node.
     metadata_.configured.network.initialize();

diff --git a/console/localize.hpp b/console/localize.hpp
@@ -232,22 +232,31 @@ namespace node {
 #define BN_CHANNEL_STOP_TARGET \
     "Stop target: %1%"
 
-#define BN_LOG_TABLE \
-    "compiled:%1% enabled:%2%."
+#define BN_VERSION_MESSAGE \
+    "Version Information...\n" \
+    "libbitcoin-node:       %1%\n" \
+    "libbitcoin-database:   %2%\n" \
+    "libbitcoin-network:    %3%\n" \
+    "libbitcoin-system:     %4%"
+
+#define BN_HARDWARE_HEADER \
+    "Hardware configuration..."
+#define BN_HARDWARE_TABLE1 \
+    "platform:%1%."
+#define BN_HARDWARE_TABLE2 \
+    "platform:%1% compiled:%2%."
+
 #define BN_LOG_TABLE_HEADER \
     "Log system configuration..."
+#define BN_LOG_TABLE \
+    "compiled:%1% enabled:%2%."
+
 #define BN_LOG_INITIALIZE_FAILURE \
     "Failed to initialize logging."
 #define BN_USING_CONFIG_FILE \
     "Using config file: %1%"
 #define BN_USING_DEFAULT_CONFIG \
     "Using default configuration settings."
-#define BN_VERSION_MESSAGE \
-    "Version Information...\n" \
-    "libbitcoin-node:       %1%\n" \
-    "libbitcoin-database:   %2%\n" \
-    "libbitcoin-network:    %3%\n" \
-    "libbitcoin-system:     %4%"
 #define BN_LOG_HEADER \
     "====================== startup ======================="
 #define BN_NODE_FOOTER \

diff --git a/src/parser.cpp b/src/parser.cpp
@@ -1052,8 +1052,8 @@ options_metadata parser::load_settings() THROWS
         "log.verbose",
         value<bool>(&configured.log.verbose),
         "Enable verbose logging, defaults to false."
+    )
 #endif
-        )
     (
         "log.maximum_size",
         value<uint32_t>(&configured.log.maximum_size),