Skip to content

Commit 60441a3

Browse files
committed
scripted-diff: [net] Rename CNode process queue members
-BEGIN VERIFY SCRIPT- ren() { sed -i "s:\<$1\>:$2:g" $(git grep -l "\<$1\>" ./src ./test); } ren cs_vProcessMsg m_msg_process_queue_mutex ren vProcessMsg m_msg_process_queue ren nProcessQueueSize m_msg_process_queue_size -END VERIFY SCRIPT-
1 parent 6693c49 commit 60441a3

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

src/net.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2797,7 +2797,7 @@ CNode::CNode(NodeId idIn,
27972797

27982798
void CNode::MarkReceivedMsgsForProcessing(unsigned int recv_flood_size)
27992799
{
2800-
AssertLockNotHeld(cs_vProcessMsg);
2800+
AssertLockNotHeld(m_msg_process_queue_mutex);
28012801

28022802
size_t nSizeAdded = 0;
28032803
for (const auto& msg : vRecvMsg) {
@@ -2806,24 +2806,24 @@ void CNode::MarkReceivedMsgsForProcessing(unsigned int recv_flood_size)
28062806
nSizeAdded += msg.m_raw_message_size;
28072807
}
28082808

2809-
LOCK(cs_vProcessMsg);
2810-
vProcessMsg.splice(vProcessMsg.end(), vRecvMsg);
2811-
nProcessQueueSize += nSizeAdded;
2812-
fPauseRecv = nProcessQueueSize > recv_flood_size;
2809+
LOCK(m_msg_process_queue_mutex);
2810+
m_msg_process_queue.splice(m_msg_process_queue.end(), vRecvMsg);
2811+
m_msg_process_queue_size += nSizeAdded;
2812+
fPauseRecv = m_msg_process_queue_size > recv_flood_size;
28132813
}
28142814

28152815
std::optional<std::pair<CNetMessage, bool>> CNode::PollMessage(size_t recv_flood_size)
28162816
{
2817-
LOCK(cs_vProcessMsg);
2818-
if (vProcessMsg.empty()) return std::nullopt;
2817+
LOCK(m_msg_process_queue_mutex);
2818+
if (m_msg_process_queue.empty()) return std::nullopt;
28192819

28202820
std::list<CNetMessage> msgs;
28212821
// Just take one message
2822-
msgs.splice(msgs.begin(), vProcessMsg, vProcessMsg.begin());
2823-
nProcessQueueSize -= msgs.front().m_raw_message_size;
2824-
fPauseRecv = nProcessQueueSize > recv_flood_size;
2822+
msgs.splice(msgs.begin(), m_msg_process_queue, m_msg_process_queue.begin());
2823+
m_msg_process_queue_size -= msgs.front().m_raw_message_size;
2824+
fPauseRecv = m_msg_process_queue_size > recv_flood_size;
28252825

2826-
return std::make_pair(std::move(msgs.front()), !vProcessMsg.empty());
2826+
return std::make_pair(std::move(msgs.front()), !m_msg_process_queue.empty());
28272827
}
28282828

28292829
bool CConnman::NodeFullyConnected(const CNode* pnode)

src/net.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -420,15 +420,15 @@ class CNode
420420

421421
/** Move all messages from the received queue to the processing queue. */
422422
void MarkReceivedMsgsForProcessing(unsigned int recv_flood_size)
423-
EXCLUSIVE_LOCKS_REQUIRED(!cs_vProcessMsg);
423+
EXCLUSIVE_LOCKS_REQUIRED(!m_msg_process_queue_mutex);
424424

425425
/** Poll the next message from the processing queue of this connection.
426426
*
427427
* Returns std::nullopt if the processing queue is empty, or a pair
428428
* consisting of the message and a bool that indicates if the processing
429429
* queue has more entries. */
430430
std::optional<std::pair<CNetMessage, bool>> PollMessage(size_t recv_flood_size)
431-
EXCLUSIVE_LOCKS_REQUIRED(!cs_vProcessMsg);
431+
EXCLUSIVE_LOCKS_REQUIRED(!m_msg_process_queue_mutex);
432432

433433
bool IsOutboundOrBlockRelayConn() const {
434434
switch (m_conn_type) {
@@ -615,9 +615,9 @@ class CNode
615615

616616
std::list<CNetMessage> vRecvMsg; // Used only by SocketHandler thread
617617

618-
Mutex cs_vProcessMsg;
619-
std::list<CNetMessage> vProcessMsg GUARDED_BY(cs_vProcessMsg);
620-
size_t nProcessQueueSize GUARDED_BY(cs_vProcessMsg){0};
618+
Mutex m_msg_process_queue_mutex;
619+
std::list<CNetMessage> m_msg_process_queue GUARDED_BY(m_msg_process_queue_mutex);
620+
size_t m_msg_process_queue_size GUARDED_BY(m_msg_process_queue_mutex){0};
621621

622622
// Our address, as reported by the peer
623623
CService addrLocal GUARDED_BY(m_addr_local_mutex);

0 commit comments

Comments
 (0)