From fc4e2d36718fba101340b3a04eec38556018f1cd Mon Sep 17 00:00:00 2001 From: clemahieu Date: Wed, 30 Mar 2016 22:29:26 -0500 Subject: [PATCH] Using the multithreaded logger. --- rai/core_test/block_synchronization.cpp | 2 +- rai/node/bootstrap.cpp | 6 +++--- rai/node/bootstrap.hpp | 8 ++++---- rai/node/node.hpp | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rai/core_test/block_synchronization.cpp b/rai/core_test/block_synchronization.cpp index eba30480..f7322952 100644 --- a/rai/core_test/block_synchronization.cpp +++ b/rai/core_test/block_synchronization.cpp @@ -1,7 +1,7 @@ #include #include -static boost::log::sources::logger test_log; +static boost::log::sources::logger_mt test_log; TEST (pull_synchronization, empty) { diff --git a/rai/node/bootstrap.cpp b/rai/node/bootstrap.cpp index 2cb97e0f..2a97546c 100644 --- a/rai/node/bootstrap.cpp +++ b/rai/node/bootstrap.cpp @@ -5,7 +5,7 @@ #include -rai::block_synchronization::block_synchronization (boost::log::sources::logger & log_a, std::function const & target_a, rai::block_store & store_a) : +rai::block_synchronization::block_synchronization (boost::log::sources::logger_mt & log_a, std::function const & target_a, rai::block_store & store_a) : log (log_a), target (target_a), store (store_a) @@ -124,7 +124,7 @@ bool rai::block_synchronization::synchronize (rai::transaction & transaction_a, return result; } -rai::pull_synchronization::pull_synchronization (boost::log::sources::logger & log_a, std::function const & target_a, rai::block_store & store_a) : +rai::pull_synchronization::pull_synchronization (boost::log::sources::logger_mt & log_a, std::function const & target_a, rai::block_store & store_a) : block_synchronization (log_a, target_a, store_a) { } @@ -139,7 +139,7 @@ bool rai::pull_synchronization::synchronized (rai::transaction & transaction_a, return store.block_exists (transaction_a, hash_a); } -rai::push_synchronization::push_synchronization (boost::log::sources::logger & log_a, std::function const & target_a, rai::block_store & store_a) : +rai::push_synchronization::push_synchronization (boost::log::sources::logger_mt & log_a, std::function const & target_a, rai::block_store & store_a) : block_synchronization (log_a, target_a, store_a) { } diff --git a/rai/node/bootstrap.hpp b/rai/node/bootstrap.hpp index 9f172668..52e8ee2a 100644 --- a/rai/node/bootstrap.hpp +++ b/rai/node/bootstrap.hpp @@ -14,7 +14,7 @@ namespace rai class block_synchronization { public: - block_synchronization (boost::log::sources::logger &, std::function const &, rai::block_store &); + block_synchronization (boost::log::sources::logger_mt &, std::function const &, rai::block_store &); ~block_synchronization (); // Return true if target already has block virtual bool synchronized (rai::transaction &, rai::block_hash const &) = 0; @@ -26,21 +26,21 @@ public: bool synchronize (rai::transaction &, rai::block_hash const &); std::stack blocks; std::unordered_set sent; - boost::log::sources::logger & log; + boost::log::sources::logger_mt & log; std::function target; rai::block_store & store; }; class pull_synchronization : public rai::block_synchronization { public: - pull_synchronization (boost::log::sources::logger &, std::function const &, rai::block_store &); + pull_synchronization (boost::log::sources::logger_mt &, std::function const &, rai::block_store &); bool synchronized (rai::transaction &, rai::block_hash const &) override; std::unique_ptr retrieve (rai::transaction &, rai::block_hash const &) override; }; class push_synchronization : public rai::block_synchronization { public: - push_synchronization (boost::log::sources::logger &, std::function const &, rai::block_store &); + push_synchronization (boost::log::sources::logger_mt &, std::function const &, rai::block_store &); bool synchronized (rai::transaction &, rai::block_hash const &) override; std::unique_ptr retrieve (rai::transaction &, rai::block_hash const &) override; }; diff --git a/rai/node/node.hpp b/rai/node/node.hpp index 30d41b8d..d1ce04bc 100644 --- a/rai/node/node.hpp +++ b/rai/node/node.hpp @@ -369,7 +369,7 @@ public: rai::node_config config; rai::alarm & alarm; rai::work_pool & work; - boost::log::sources::logger log; + boost::log::sources::logger_mt log; rai::block_store store; rai::gap_cache gap_cache; rai::ledger ledger;