Skip to content

Commit 6e55bda

Browse files
committed
GH-1071 Add comments and minor cleanup
1 parent 6980451 commit 6e55bda

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

plugins/net_plugin/net_plugin.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -635,9 +635,9 @@ namespace eosio {
635635
_write_queue_size = 0;
636636
}
637637

638-
void clear_out_queue(boost::system::error_code ec, std::size_t w) {
638+
void clear_out_queue(boost::system::error_code ec, std::size_t number_of_bytes_written) {
639639
fc::lock_guard g( _mtx );
640-
out_callback( ec, w );
640+
out_callback( ec, number_of_bytes_written );
641641
_out_queue.clear();
642642
}
643643

@@ -704,9 +704,9 @@ namespace eosio {
704704
}
705705
}
706706

707-
void out_callback( boost::system::error_code ec, std::size_t w ) REQUIRES(_mtx) {
707+
void out_callback( boost::system::error_code ec, std::size_t number_of_bytes_written ) REQUIRES(_mtx) {
708708
for( auto& m : _out_queue ) {
709-
m.callback( ec, w );
709+
m.callback( ec, number_of_bytes_written );
710710
}
711711
}
712712

@@ -718,10 +718,10 @@ namespace eosio {
718718

719719
alignas(hardware_destructive_interference_sz)
720720
mutable fc::mutex _mtx;
721-
uint32_t _write_queue_size GUARDED_BY(_mtx) {0};
722-
deque<queued_write> _write_queue GUARDED_BY(_mtx);
723-
deque<queued_write> _trx_write_queue GUARDED_BY(_mtx); // trx_write_queue will be sent last
724-
deque<queued_write> _out_queue GUARDED_BY(_mtx);
721+
uint32_t _write_queue_size GUARDED_BY(_mtx) {0}; // size of _write_queue and _trx_write_queue
722+
deque<queued_write> _write_queue GUARDED_BY(_mtx); // queued messages, all messages except trxs
723+
deque<queued_write> _trx_write_queue GUARDED_BY(_mtx); // queued trx messages, trx_write_queue will be sent last
724+
deque<queued_write> _out_queue GUARDED_BY(_mtx); // currently being async_write
725725

726726
}; // queued_buffer
727727

@@ -1593,8 +1593,8 @@ namespace eosio {
15931593
std::vector<boost::asio::const_buffer> bufs;
15941594
buffer_queue.fill_out_buffer( bufs );
15951595

1596-
boost::asio::async_write( *c->socket, bufs,
1597-
boost::asio::bind_executor( c->strand, [c, socket=c->socket]( boost::system::error_code ec, std::size_t w ) {
1596+
boost::asio::async_write( *socket, bufs,
1597+
boost::asio::bind_executor( strand, [c, socket=socket]( boost::system::error_code ec, std::size_t w ) {
15981598
try {
15991599
peer_dlog(c, "async write complete");
16001600
// May have closed connection and cleared buffer_queue

0 commit comments

Comments
 (0)