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

Move tcp_message_manager into tcp_channels class

Browse source
This commit is contained in:
Piotr Wójcik 2024-03-14 19:21:47 +01:00 • committed by Piotr Wójcik
commit e1d1517ab8
5 changed files with 36 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nano/node/network.cpp
View file

@ -20,7 +20,6 @@ nano::network::network (nano::node & node, uint16_t port) :
id{ nano::network_constants::active_network },
syn_cookies{ node.network_params.network.max_peers_per_ip, node.logger },
resolver{ node.io_ctx },
tcp_message_manager{ node.config.tcp_incoming_connections_max },
publish_filter{ 256 * 1024 },
tcp_channels{ node, [this] (nano::message const & message, std::shared_ptr<nano::transport::channel> const & channel) {
inbound (message, channel);
@ -73,7 +72,6 @@ void nano::network::stop ()
tcp_channels.stop ();
resolver.cancel ();
tcp_message_manager.stop ();
for (auto & thread : processing_threads)
{

22
nano/node/network.hpp
View file

@ -16,27 +16,6 @@ namespace nano
{
class node;
class tcp_message_manager final
{
public:
tcp_message_manager (unsigned incoming_connections_max_a);
void put_message (nano::tcp_message_item const & item_a);
nano::tcp_message_item get_message ();
// Stop container and notify waiting threads
void stop ();
private:
nano::mutex mutex;
nano::condition_variable producer_condition;
nano::condition_variable consumer_condition;
std::deque<nano::tcp_message_item> entries;
unsigned max_entries;
static unsigned const max_entries_per_connection = 16;
bool stopped{ false };
friend class network_tcp_message_manager_Test;
};
/**
* Node ID cookies for node ID handshakes
*/
@ -142,7 +121,6 @@ public:
nano::syn_cookies syn_cookies;
boost::asio::ip::udp::resolver resolver;
nano::peer_exclusion excluded_peers;
nano::tcp_message_manager tcp_message_manager;
nano::network_filter publish_filter;
nano::transport::tcp_channels tcp_channels;
std::atomic<uint16_t> port{ 0 };

6
nano/node/transport/tcp.cpp
View file

@ -126,6 +126,7 @@ void nano::transport::channel_tcp::operator() (nano::object_stream & obs) const
nano::transport::tcp_channels::tcp_channels (nano::node & node, std::function<void (nano::message const &, std::shared_ptr<nano::transport::channel> const &)> sink) :
node{ node },
message_manager{ node.config.tcp_incoming_connections_max },
sink{ std::move (sink) }
{
}
@ -295,7 +296,7 @@ void nano::transport::tcp_channels::process_messages ()
{
while (!stopped)
{
auto item (node.network.tcp_message_manager.get_message ());
auto item = message_manager.get_message ();
if (item.message != nullptr)
{
process_message (*item.message, item.endpoint, item.node_id, item.socket);
@ -364,6 +365,9 @@ void nano::transport::tcp_channels::stop ()
{
stopped = true;
nano::unique_lock<nano::mutex> lock{ mutex };
message_manager.stop ();
// Close all TCP sockets
for (auto const & channel : channels)
{

31
nano/node/transport/tcp.hpp
View file

@ -25,6 +25,28 @@ public:
nano::account node_id;
std::shared_ptr<nano::transport::socket> socket;
};
class tcp_message_manager final
{
public:
tcp_message_manager (unsigned incoming_connections_max_a);
void put_message (nano::tcp_message_item const & item_a);
nano::tcp_message_item get_message ();
// Stop container and notify waiting threads
void stop ();
private:
nano::mutex mutex;
nano::condition_variable producer_condition;
nano::condition_variable consumer_condition;
std::deque<nano::tcp_message_item> entries;
unsigned max_entries;
static unsigned const max_entries_per_connection = 16;
bool stopped{ false };
friend class network_tcp_message_manager_Test;
};
namespace transport
{
class tcp_server;
@ -136,10 +158,14 @@ namespace transport
// Connection start
void start_tcp (nano::endpoint const &);
void start_tcp_receive_node_id (std::shared_ptr<nano::transport::channel_tcp> const &, nano::endpoint const &, std::shared_ptr<std::vector<uint8_t>> const &);
private: // Dependencies
nano::node & node;
public:
nano::tcp_message_manager message_manager;
private:
std::function<void (nano::message const &, std::shared_ptr<nano::transport::channel> const &)> sink;
class endpoint_tag
{
};
@ -255,6 +281,9 @@ namespace transport
mi::member<tcp_endpoint_attempt, std::chrono::steady_clock::time_point, &tcp_endpoint_attempt::last_attempt>>>>
attempts;
// clang-format on
private:
std::function<void (nano::message const &, std::shared_ptr<nano::transport::channel> const &)> sink;
std::atomic<bool> stopped{ false };
friend class network_peer_max_tcp_attempts_subnetwork_Test;

2
nano/node/transport/tcp_server.cpp
View file

@ -496,7 +496,7 @@ void nano::transport::tcp_server::queue_realtime (std::unique_ptr<nano::message>
{
return;
}
node->network.tcp_message_manager.put_message (nano::tcp_message_item{ std::move (message), remote_endpoint, remote_node_id, socket });
node->network.tcp_channels.message_manager.put_message (nano::tcp_message_item{ std::move (message), remote_endpoint, remote_node_id, socket });
}
/*