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

Swapping atomic_flag for atomic_bool which can be queried.

Browse source
This commit is contained in:
clemahieu 2016-03-30 18:28:12 -05:00
commit 20ad514d34
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rai/node/bootstrap.cpp
View file

@ -185,11 +185,7 @@ void rai::bootstrap_client::run (boost::asio::ip::tcp::endpoint const & endpoint
{
if (!ec)
{
{
std::lock_guard <std::mutex> lock (this_l->node->bootstrap_initiator.mutex);
this_l->attempt->peers.clear ();
}
if (!this_l->attempt->connected.test_and_set ())
if (!this_l->attempt->connected.exchange (true))
{
this_l->connect_action ();
}
@ -774,9 +770,9 @@ void rai::bulk_push_client::push_block (rai::block const & block_a)
rai::bootstrap_attempt::bootstrap_attempt (std::shared_ptr <rai::node> node_a, std::vector <rai::endpoint> const & peers_a) :
node (node_a),
peers (peers_a)
peers (peers_a),
connected (false)
{
connected.clear ();
}
rai::bootstrap_attempt::~bootstrap_attempt ()
@ -788,7 +784,7 @@ rai::bootstrap_attempt::~bootstrap_attempt ()
void rai::bootstrap_attempt::attempt ()
{
if (!peers.empty ())
if (!peers.empty () && !connected)
{
rai::endpoint endpoint (peers.back ());
peers.pop_back ();

2
rai/node/bootstrap.hpp
View file

@ -52,7 +52,7 @@ public:
void attempt ();
std::shared_ptr <rai::node> node;
std::vector <rai::endpoint> peers;
std::atomic_flag connected;
std::atomic_bool connected;
};
class bootstrap_client : public std::enable_shared_from_this <bootstrap_client>
{