Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Using the multithreaded logger.

Browse source
This commit is contained in:
clemahieu 2016-03-30 22:29:26 -05:00
commit fc4e2d3671
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rai/core_test/block_synchronization.cpp
View file

@ -1,7 +1,7 @@
#include <gtest/gtest.h>
#include <rai/node/node.hpp>
static boost::log::sources::logger test_log;
static boost::log::sources::logger_mt test_log;
TEST (pull_synchronization, empty)
{

6
rai/node/bootstrap.cpp
View file

@ -5,7 +5,7 @@
#include <boost/log/trivial.hpp>
rai::block_synchronization::block_synchronization (boost::log::sources::logger & log_a, std::function <void (rai::transaction &, rai::block const &)> const & target_a, rai::block_store & store_a) :
rai::block_synchronization::block_synchronization (boost::log::sources::logger_mt & log_a, std::function <void (rai::transaction &, rai::block const &)> 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 <void (rai::transaction &, rai::block const &)> const & target_a, rai::block_store & store_a) :
rai::pull_synchronization::pull_synchronization (boost::log::sources::logger_mt & log_a, std::function <void (rai::transaction &, rai::block const &)> 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 <void (rai::transaction &, rai::block const &)> const & target_a, rai::block_store & store_a) :
rai::push_synchronization::push_synchronization (boost::log::sources::logger_mt & log_a, std::function <void (rai::transaction &, rai::block const &)> const & target_a, rai::block_store & store_a) :
block_synchronization (log_a, target_a, store_a)
{
}

8
rai/node/bootstrap.hpp
View file

@ -14,7 +14,7 @@ namespace rai
class block_synchronization
{
public:
block_synchronization (boost::log::sources::logger &, std::function <void (rai::transaction &, rai::block const &)> const &, rai::block_store &);
block_synchronization (boost::log::sources::logger_mt &, std::function <void (rai::transaction &, rai::block const &)> 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 <rai::block_hash> blocks;
std::unordered_set <rai::block_hash> sent;
boost::log::sources::logger & log;
boost::log::sources::logger_mt & log;
std::function <void (rai::transaction &, rai::block const &)> target;
rai::block_store & store;
};
class pull_synchronization : public rai::block_synchronization
{
public:
pull_synchronization (boost::log::sources::logger &, std::function <void (rai::transaction &, rai::block const &)> const &, rai::block_store &);
pull_synchronization (boost::log::sources::logger_mt &, std::function <void (rai::transaction &, rai::block const &)> const &, rai::block_store &);
bool synchronized (rai::transaction &, rai::block_hash const &) override;
std::unique_ptr <rai::block> retrieve (rai::transaction &, rai::block_hash const &) override;
};
class push_synchronization : public rai::block_synchronization
{
public:
push_synchronization (boost::log::sources::logger &, std::function <void (rai::transaction &, rai::block const &)> const &, rai::block_store &);
push_synchronization (boost::log::sources::logger_mt &, std::function <void (rai::transaction &, rai::block const &)> const &, rai::block_store &);
bool synchronized (rai::transaction &, rai::block_hash const &) override;
std::unique_ptr <rai::block> retrieve (rai::transaction &, rai::block_hash const &) override;
};

2
rai/node/node.hpp
View file

@ -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;