Skip to content

Commit dbf779d

Browse files
committed
Clean PushMessage and ProcessMessages
This brings PushMessage and ProcessMessages further in line with the style guide by fixing their if statements. LogMessage is later called, inside an if statement, inside both of these methods.
1 parent bc51b99 commit dbf779d

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

src/net.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2879,18 +2879,14 @@ void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
28792879
pnode->mapSendBytesPerMsgCmd[msg.m_type] += nTotalSize;
28802880
pnode->nSendSize += nTotalSize;
28812881

2882-
if (pnode->nSendSize > nSendBufferMaxSize)
2883-
pnode->fPauseSend = true;
2882+
if (pnode->nSendSize > nSendBufferMaxSize) pnode->fPauseSend = true;
28842883
pnode->vSendMsg.push_back(std::move(serializedHeader));
2885-
if (nMessageSize)
2886-
pnode->vSendMsg.push_back(std::move(msg.data));
2884+
if (nMessageSize) pnode->vSendMsg.push_back(std::move(msg.data));
28872885

28882886
// If write queue empty, attempt "optimistic write"
2889-
if (optimisticSend == true)
2890-
nBytesSent = SocketSendData(*pnode);
2887+
if (optimisticSend) nBytesSent = SocketSendData(*pnode);
28912888
}
2892-
if (nBytesSent)
2893-
RecordBytesSent(nBytesSent);
2889+
if (nBytesSent) RecordBytesSent(nBytesSent);
28942890
}
28952891

28962892
bool CConnman::ForNode(NodeId id, std::function<bool(CNode* pnode)> func)

src/net_processing.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4028,14 +4028,12 @@ bool PeerManagerImpl::ProcessMessages(CNode* pfrom, std::atomic<bool>& interrupt
40284028
}
40294029

40304030
// Don't bother if send buffer is too full to respond anyway
4031-
if (pfrom->fPauseSend)
4032-
return false;
4031+
if (pfrom->fPauseSend) return false;
40334032

40344033
std::list<CNetMessage> msgs;
40354034
{
40364035
LOCK(pfrom->cs_vProcessMsg);
4037-
if (pfrom->vProcessMsg.empty())
4038-
return false;
4036+
if (pfrom->vProcessMsg.empty()) return false;
40394037
// Just take one message
40404038
msgs.splice(msgs.begin(), pfrom->vProcessMsg, pfrom->vProcessMsg.begin());
40414039
pfrom->nProcessQueueSize -= msgs.front().m_raw_message_size;

0 commit comments

Comments
 (0)